diff options
| author | Chris Mason <clm@fb.com> | 2015-12-23 22:17:42 +0100 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2015-12-23 22:17:42 +0100 |
| commit | bb9d687618695e8291f1e6209eb3211d231f97bb (patch) | |
| tree | a54f15066574a80231b3a2630b300f0ebc3745c2 /fs/btrfs/scrub.c | |
| parent | Merge branch 'dev/gfp-flags' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | btrfs: make lock_extent static inline (diff) | |
| download | linux-bb9d687618695e8291f1e6209eb3211d231f97bb.tar.xz linux-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/scrub.c')
| -rw-r--r-- | fs/btrfs/scrub.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c index b091d94ceef6..69987150ddfa 100644 --- a/fs/btrfs/scrub.c +++ b/fs/btrfs/scrub.c @@ -4211,7 +4211,7 @@ static int check_extent_to_block(struct inode *inode, u64 start, u64 len, io_tree = &BTRFS_I(inode)->io_tree; - lock_extent_bits(io_tree, lockstart, lockend, 0, &cached_state); + lock_extent_bits(io_tree, lockstart, lockend, &cached_state); ordered = btrfs_lookup_ordered_range(inode, lockstart, len); if (ordered) { btrfs_put_ordered_extent(ordered); |