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/disk-io.c | |
| parent | 13d5d15d6301f8e69a8fe8500f6ef732bfd44bd1 (diff) | |
| parent | cd716d8fea125e5531003e66aaf7ca7323277f83 (diff) | |
| download | op-kernel-dev-bb9d687618695e8291f1e6209eb3211d231f97bb.zip op-kernel-dev-bb9d687618695e8291f1e6209eb3211d231f97bb.tar.gz | |
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/disk-io.c')
| -rw-r--r-- | fs/btrfs/disk-io.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 166ad08..843dbd7 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -362,7 +362,7 @@ static int verify_parent_transid(struct extent_io_tree *io_tree, } lock_extent_bits(io_tree, eb->start, eb->start + eb->len - 1, - 0, &cached_state); + &cached_state); if (extent_buffer_uptodate(eb) && btrfs_header_generation(eb) == parent_transid) { ret = 0; |
