ocfs2: use allocation reservations during file write

Add a per-inode reservations structure and pass it through to the
reservations code.

Signed-off-by: Mark Fasheh <mfasheh@suse.com>

diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c
index 89e994dad0260de6d444b6849fbaf717356b18ed..a74ea700ffdc30d75a42e0b8297fde4f3b76cad8 100644 (file)
--- a/fs/ocfs2/alloc.c
+++ b/fs/ocfs2/alloc.c
@@ -7211,6 +7211,8 @@ int ocfs2_convert_inline_data_to_extents(struct inode *inode,
                        goto out_commit;
                did_quota = 1;
 
+               data_ac->ac_resv = &OCFS2_I(inode)->ip_la_data_resv;
+
                ret = ocfs2_claim_clusters(osb, handle, data_ac, 1, &bit_off,
                                           &num);
                if (ret) {

diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c
index 21441ddb550659d20b875da3d2d6a6c16cb33e5c..3623ca20cc186046cfbf840f03ce9705146b17ba 100644 (file)
--- a/fs/ocfs2/aops.c
+++ b/fs/ocfs2/aops.c
@@ -1735,6 +1735,9 @@ int ocfs2_write_begin_nolock(struct address_space *mapping,
                        goto out;
                }
 
+               if (data_ac)
+                       data_ac->ac_resv = &OCFS2_I(inode)->ip_la_data_resv;
+
                credits = ocfs2_calc_extend_credits(inode->i_sb,
                                                    &di->id2.i_list,
                                                    clusters_to_alloc);

diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index e6e8281628a60542dc115d21fbbd9cb4f58b1f35..19d16f2ef81ee5bc22fb54bb06a1c69472061fb6 100644 (file)
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -483,6 +483,9 @@ static int ocfs2_truncate_file(struct inode *inode,
 
        down_write(&OCFS2_I(inode)->ip_alloc_sem);
 
+       ocfs2_resv_discard(&osb->osb_la_resmap,
+                          &OCFS2_I(inode)->ip_la_data_resv);
+
        /*
         * The inode lock forced other nodes to sync and drop their
         * pages, which (correctly) happens even if we have a truncate

diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c
index 7cc0b4665d5e107b39023f4350b7ef85601b9f7a..62b4743fb6f1b3a869f76ed2368b75592ec41465 100644 (file)
--- a/fs/ocfs2/inode.c
+++ b/fs/ocfs2/inode.c
@@ -1096,6 +1096,10 @@ void ocfs2_clear_inode(struct inode *inode)
        ocfs2_mark_lockres_freeing(&oi->ip_inode_lockres);
        ocfs2_mark_lockres_freeing(&oi->ip_open_lockres);
 
+       ocfs2_resv_discard(&OCFS2_SB(inode->i_sb)->osb_la_resmap,
+                          &oi->ip_la_data_resv);
+       ocfs2_resv_init_once(&oi->ip_la_data_resv);
+
        /* We very well may get a clear_inode before all an inodes
         * metadata has hit disk. Of course, we can't drop any cluster
         * locks until the journal has finished with it. The only

diff --git a/fs/ocfs2/inode.h b/fs/ocfs2/inode.h
index ba4fe07b293c6f4c2d6d864a7e5a491ad082d7ea..e45edca025947f2c0d25db3f9957ca02e3e9e8a1 100644 (file)
--- a/fs/ocfs2/inode.h
+++ b/fs/ocfs2/inode.h
@@ -70,6 +70,8 @@ struct ocfs2_inode_info
        /* Only valid if the inode is the dir. */
        u32                             ip_last_used_slot;
        u64                             ip_last_used_group;
+
+       struct ocfs2_alloc_reservation  ip_la_data_resv;
 };
 
 /*

diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
index cfe672e72b27b9e9e171fa687eedcb7d853a8c3d..2a9f4c455f28dbc11c35f86ed40f3194a3e11205 100644 (file)
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
@@ -1707,6 +1707,8 @@ static void ocfs2_inode_init_once(void *data)
        oi->ip_blkno = 0ULL;
        oi->ip_clusters = 0;
 
+       ocfs2_resv_init_once(&oi->ip_la_data_resv);
+
        ocfs2_lock_res_init_once(&oi->ip_rw_lockres);
        ocfs2_lock_res_init_once(&oi->ip_inode_lockres);
        ocfs2_lock_res_init_once(&oi->ip_open_lockres);