diff options
| author | Chris Mason <clm@fb.com> | 2015-12-23 13:17:42 -0800 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2015-12-23 13:17:42 -0800 |
| commit | bb9d687618695e8291f1e6209eb3211d231f97bb (patch) | |
| tree | a54f15066574a80231b3a2630b300f0ebc3745c2 /fs/btrfs/file.c | |
| parent | 13d5d15d6301f8e69a8fe8500f6ef732bfd44bd1 (diff) | |
| parent | cd716d8fea125e5531003e66aaf7ca7323277f83 (diff) | |
| download | linux-stable-bb9d687618695e8291f1e6209eb3211d231f97bb.tar.gz linux-stable-bb9d687618695e8291f1e6209eb3211d231f97bb.tar.bz2 linux-stable-bb9d687618695e8291f1e6209eb3211d231f97bb.zip | |
Merge branch 'dev/simplify-set-bit' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.5
Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs/btrfs/file.c')
| -rw-r--r-- | fs/btrfs/file.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index 0f09526aa7d9..364e0f1f61f6 100644 --- 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) { |