3 files changed, 17 insertions, 10 deletions

diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index 68537229ee1c..754c0d36d162 100644
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -1088,7 +1088,7 @@ static ext4_lblk_t ext4_ext_next_leaf_block(struct inode *inode,
  * then we have to correct all indexes above.
  * TODO: do we need to correct tree in all cases?
  */
-int ext4_ext_correct_indexes(handle_t *handle, struct inode *inode,
+static int ext4_ext_correct_indexes(handle_t *handle, struct inode *inode,
                                 struct ext4_ext_path *path)
 {
         struct ext4_extent_header *eh;
@@ -1535,7 +1535,7 @@ ext4_ext_in_cache(struct inode *inode, ext4_lblk_t block,
  * It's used in truncate case only, thus all requests are for
  * last index in the block only.
  */
-int ext4_ext_rm_idx(handle_t *handle, struct inode *inode,
+static int ext4_ext_rm_idx(handle_t *handle, struct inode *inode,
                         struct ext4_ext_path *path)
 {
         struct buffer_head *bh;
@@ -1806,7 +1806,7 @@ ext4_ext_more_to_rm(struct ext4_ext_path *path)
         return 1;
 }
 
-int ext4_ext_remove_space(struct inode *inode, ext4_lblk_t start)
+static int ext4_ext_remove_space(struct inode *inode, ext4_lblk_t start)
 {
         struct super_block *sb = inode->i_sb;
         int depth = ext_depth(inode);
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 1ee19c918686..76ceba2718b9 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -2052,11 +2052,11 @@ static void ext4_clear_blocks(handle_t *handle, struct inode *inode,
         for (p = first; p < last; p++) {
                 u32 nr = le32_to_cpu(*p);
                 if (nr) {
-                        struct buffer_head *bh;
+                        struct buffer_head *tbh;
 
                         *p = 0;
-                        bh = sb_find_get_block(inode->i_sb, nr);
-                        ext4_forget(handle, 0, inode, bh, nr);
+                        tbh = sb_find_get_block(inode->i_sb, nr);
+                        ext4_forget(handle, 0, inode, tbh, nr);
                 }
         }
 
@@ -2324,8 +2324,10 @@ void ext4_truncate(struct inode *inode)
                         return;
         }
 
-        if (EXT4_I(inode)->i_flags & EXT4_EXTENTS_FL)
-                return ext4_ext_truncate(inode, page);
+        if (EXT4_I(inode)->i_flags & EXT4_EXTENTS_FL) {
+                ext4_ext_truncate(inode, page);
+                return;
+        }
 
         handle = start_transaction(inode);
         if (IS_ERR(handle)) {
@@ -3163,8 +3165,10 @@ ext4_reserve_inode_write(handle_t *handle, struct inode *inode,
  * Expand an inode by new_extra_isize bytes.
  * Returns 0 on success or negative error number on failure.
  */
-int ext4_expand_extra_isize(struct inode *inode, unsigned int new_extra_isize,
-                        struct ext4_iloc iloc, handle_t *handle)
+static int ext4_expand_extra_isize(struct inode *inode,
+                                   unsigned int new_extra_isize,
+                                   struct ext4_iloc iloc,
+                                   handle_t *handle)
 {
         struct ext4_inode *raw_inode;
         struct ext4_xattr_ibody_header *header;
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 4d7f33f79552..7be27dbe76bf 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1644,6 +1644,9 @@ static ext4_fsblk_t descriptor_loc(struct super_block *sb,
 
 
 static int ext4_fill_super (struct super_block *sb, void *data, int silent)
+                                __releases(kernel_sem)
+                                __acquires(kernel_sem)
+
 {
         struct buffer_head * bh;
         struct ext4_super_block *es = NULL;