ext4: remove do_blk_alloc()

The convenience function do_blk_alloc() is a static function with only
one caller, so fold it into ext4_new_meta_blocks() to simplify the
code and to make it easier to understand.

To save more stack space, if count is a null pointer in
ext4_new_meta_blocks() assume that caller wanted a single block (and
if there is an error, no blocks were allocated).

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

1 files changed, 1 insertions, 2 deletions

diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
index f896e2c452f0..9b4a368c5728 100644
--- a/fs/ext4/xattr.c
+++ b/fs/ext4/xattr.c
@@ -689,7 +689,6 @@ ext4_xattr_block_set(handle_t *handle, struct inode *inode,
                      struct ext4_xattr_info *i,
                      struct ext4_xattr_block_find *bs)
 {
-        unsigned long count = 1;
         struct super_block *sb = inode->i_sb;
         struct buffer_head *new_bh = NULL;
         struct ext4_xattr_search *s = &bs->s;
@@ -812,7 +811,7 @@ inserted:
                         ext4_fsblk_t goal = ext4_group_first_block_no(sb,
                                                 EXT4_I(inode)->i_block_group);
                         ext4_fsblk_t block = ext4_new_meta_blocks(handle, inode,
-                                                  goal, &count, &error);
+                                                  goal, NULL, &error);
                         if (error)
                                 goto cleanup;
                         ea_idebug(inode, "creating block %d", block);