Merge tag 'sound-3.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[karo-tx-linux.git] / fs / ext4 / move_extent.c

diff --git a/fs/ext4/move_extent.c b/fs/ext4/move_extent.c
index 773b503bd18cf840a048788b4c536717fafbb7e6..58ee7dc87669d9f49961a4be47335ae5e4615638 100644 (file)
--- a/fs/ext4/move_extent.c
+++ b/fs/ext4/move_extent.c
@@ -76,7 +76,7 @@ copy_extent_status(struct ext4_extent *src, struct ext4_extent *dest)
  * ext4_ext_path structure refers to the last extent, or a negative error
  * value on failure.
  */
-static int
+int
 mext_next_extent(struct inode *inode, struct ext4_ext_path *path,
                      struct ext4_extent **extent)
 {
@@ -861,8 +861,7 @@ mext_page_mkuptodate(struct page *page, unsigned from, unsigned to)
                        }
                        if (!buffer_mapped(bh)) {
                                zero_user(page, block_start, blocksize);
-                               if (!err)
-                                       set_buffer_uptodate(bh);
+                               set_buffer_uptodate(bh);
                                continue;
                        }
                }