GFS2: combine gfs2_alloc_block and gfs2_alloc_di

GFS2 functions gfs2_alloc_block and gfs2_alloc_di do basically
the same things, with a few exceptions. This patch combines
the two functions into a slightly more generic gfs2_alloc_block.
Having one centralized block allocation function will reduce
code redundancy and make it easier to implement multi-block
reservations to reduce file fragmentation in the future.

Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/fs/gfs2/xattr.c b/fs/gfs2/xattr.c
index a201a1d57a6d..e4794a5b0a16 100644
--- a/fs/gfs2/xattr.c
+++ b/fs/gfs2/xattr.c
@@ -610,7 +610,7 @@ static int ea_alloc_blk(struct gfs2_inode *ip, struct buffer_head **bhp)
         u64 block;
         int error;
 
-        error = gfs2_alloc_block(ip, &block, &n);
+        error = gfs2_alloc_block(ip, &block, &n, 0, NULL);
         if (error)
                 return error;
         gfs2_trans_add_unrevoke(sdp, block, 1);
@@ -672,7 +672,7 @@ static int ea_write(struct gfs2_inode *ip, struct gfs2_ea_header *ea,
                         int mh_size = sizeof(struct gfs2_meta_header);
                         unsigned int n = 1;
 
-                        error = gfs2_alloc_block(ip, &block, &n);
+                        error = gfs2_alloc_block(ip, &block, &n, 0, NULL);
                         if (error)
                                 return error;
                         gfs2_trans_add_unrevoke(sdp, block, 1);
@@ -992,7 +992,7 @@ static int ea_set_block(struct gfs2_inode *ip, struct gfs2_ea_request *er,
         } else {
                 u64 blk;
                 unsigned int n = 1;
-                error = gfs2_alloc_block(ip, &blk, &n);
+                error = gfs2_alloc_block(ip, &blk, &n, 0, NULL);
                 if (error)
                         return error;
                 gfs2_trans_add_unrevoke(sdp, blk, 1);