Merge branch 'for-linus-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/mason...

[mirror_ubuntu-artful-kernel.git] / fs / btrfs / file.c

diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index e3d9022bfd4e3c2861008104d13e55050aa91f13..83d7859d76199d96ec882c35c87dea98526d229e 100644 (file)
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -1394,7 +1394,7 @@ lock_and_cleanup_extent_if_need(struct inode *inode, struct page **pages,
        if (start_pos < inode->i_size) {
                struct btrfs_ordered_extent *ordered;
                lock_extent_bits(&BTRFS_I(inode)->io_tree,
-                                start_pos, last_pos, 0, cached_state);
+                                start_pos, last_pos, cached_state);
                ordered = btrfs_lookup_ordered_range(inode, start_pos,
                                                     last_pos - start_pos + 1);
                if (ordered &&
@@ -2398,7 +2398,7 @@ static int btrfs_punch_hole(struct inode *inode, loff_t offset, loff_t len)
                truncate_pagecache_range(inode, lockstart, lockend);
 
                lock_extent_bits(&BTRFS_I(inode)->io_tree, lockstart, lockend,
-                                0, &cached_state);
+                                &cached_state);
                ordered = btrfs_lookup_first_ordered_extent(inode, lockend);
 
                /*
@@ -2705,7 +2705,7 @@ static long btrfs_fallocate(struct file *file, int mode,
                 * transaction
                 */
                lock_extent_bits(&BTRFS_I(inode)->io_tree, alloc_start,
-                                locked_end, 0, &cached_state);
+                                locked_end, &cached_state);
                ordered = btrfs_lookup_first_ordered_extent(inode,
                                                            alloc_end - 1);
                if (ordered &&
@@ -2852,7 +2852,7 @@ static int find_desired_extent(struct inode *inode, loff_t *offset, int whence)
        lockend--;
        len = lockend - lockstart + 1;
 
-       lock_extent_bits(&BTRFS_I(inode)->io_tree, lockstart, lockend, 0,
+       lock_extent_bits(&BTRFS_I(inode)->io_tree, lockstart, lockend,
                         &cached_state);
 
        while (start < inode->i_size) {