1 files changed, 12 insertions, 12 deletions

diff --git a/fs/ext3/xattr.c b/fs/ext3/xattr.c
index 42856541e9a5..d4a4f0e9ff69 100644
--- a/fs/ext3/xattr.c
+++ b/fs/ext3/xattr.c
@@ -99,6 +99,8 @@ static struct buffer_head *ext3_xattr_cache_find(struct inode *,
                                                  struct mb_cache_entry **);
 static void ext3_xattr_rehash(struct ext3_xattr_header *,
                               struct ext3_xattr_entry *);
+static int ext3_xattr_list(struct inode *inode, char *buffer,
+                           size_t buffer_size);
 
 static struct mb_cache *ext3_xattr_cache;
 
@@ -232,7 +234,7 @@ ext3_xattr_block_get(struct inode *inode, int name_index, const char *name,
         ea_bdebug(bh, "b_count=%d, refcount=%d",
                 atomic_read(&(bh->b_count)), le32_to_cpu(BHDR(bh)->h_refcount));
         if (ext3_xattr_check_block(bh)) {
-bad_block:      ext3_error(inode->i_sb, __FUNCTION__,
+bad_block:      ext3_error(inode->i_sb, __func__,
                            "inode %lu: bad block "E3FSBLK, inode->i_ino,
                            EXT3_I(inode)->i_file_acl);
                 error = -EIO;
@@ -374,7 +376,7 @@ ext3_xattr_block_list(struct inode *inode, char *buffer, size_t buffer_size)
         ea_bdebug(bh, "b_count=%d, refcount=%d",
                 atomic_read(&(bh->b_count)), le32_to_cpu(BHDR(bh)->h_refcount));
         if (ext3_xattr_check_block(bh)) {
-                ext3_error(inode->i_sb, __FUNCTION__,
+                ext3_error(inode->i_sb, __func__,
                            "inode %lu: bad block "E3FSBLK, inode->i_ino,
                            EXT3_I(inode)->i_file_acl);
                 error = -EIO;
@@ -427,7 +429,7 @@ cleanup:
  * Returns a negative error number on failure, or the number of bytes
  * used / required on success.
  */
-int
+static int
 ext3_xattr_list(struct inode *inode, char *buffer, size_t buffer_size)
 {
         int i_error, b_error;
@@ -649,7 +651,7 @@ ext3_xattr_block_find(struct inode *inode, struct ext3_xattr_info *i,
                         atomic_read(&(bs->bh->b_count)),
                         le32_to_cpu(BHDR(bs->bh)->h_refcount));
                 if (ext3_xattr_check_block(bs->bh)) {
-                        ext3_error(sb, __FUNCTION__,
+                        ext3_error(sb, __func__,
                                 "inode %lu: bad block "E3FSBLK, inode->i_ino,
                                 EXT3_I(inode)->i_file_acl);
                         error = -EIO;
@@ -797,10 +799,8 @@ inserted:
                         get_bh(new_bh);
                 } else {
                         /* We need to allocate a new block */
-                        ext3_fsblk_t goal = le32_to_cpu(
-                                        EXT3_SB(sb)->s_es->s_first_data_block) +
-                                (ext3_fsblk_t)EXT3_I(inode)->i_block_group *
-                                EXT3_BLOCKS_PER_GROUP(sb);
+                        ext3_fsblk_t goal = ext3_group_first_block_no(sb,
+                                                EXT3_I(inode)->i_block_group);
                         ext3_fsblk_t block = ext3_new_block(handle, inode,
                                                         goal, &error);
                         if (error)
@@ -852,7 +852,7 @@ cleanup_dquot:
         goto cleanup;
 
 bad_block:
-        ext3_error(inode->i_sb, __FUNCTION__,
+        ext3_error(inode->i_sb, __func__,
                    "inode %lu: bad block "E3FSBLK, inode->i_ino,
                    EXT3_I(inode)->i_file_acl);
         goto cleanup;
@@ -1081,14 +1081,14 @@ ext3_xattr_delete_inode(handle_t *handle, struct inode *inode)
                 goto cleanup;
         bh = sb_bread(inode->i_sb, EXT3_I(inode)->i_file_acl);
         if (!bh) {
-                ext3_error(inode->i_sb, __FUNCTION__,
+                ext3_error(inode->i_sb, __func__,
                         "inode %lu: block "E3FSBLK" read error", inode->i_ino,
                         EXT3_I(inode)->i_file_acl);
                 goto cleanup;
         }
         if (BHDR(bh)->h_magic != cpu_to_le32(EXT3_XATTR_MAGIC) ||
             BHDR(bh)->h_blocks != cpu_to_le32(1)) {
-                ext3_error(inode->i_sb, __FUNCTION__,
+                ext3_error(inode->i_sb, __func__,
                         "inode %lu: bad block "E3FSBLK, inode->i_ino,
                         EXT3_I(inode)->i_file_acl);
                 goto cleanup;
@@ -1215,7 +1215,7 @@ again:
                 }
                 bh = sb_bread(inode->i_sb, ce->e_block);
                 if (!bh) {
-                        ext3_error(inode->i_sb, __FUNCTION__,
+                        ext3_error(inode->i_sb, __func__,
                                 "inode %lu: block %lu read error",
                                 inode->i_ino, (unsigned long) ce->e_block);
                 } else if (le32_to_cpu(BHDR(bh)->h_refcount) >=