diff options
| author | Chris Mason | 2015-12-23 22:17:42 +0100 |
|---|---|---|
| committer | Chris Mason | 2015-12-23 22:17:42 +0100 |
| commit | bb9d687618695e8291f1e6209eb3211d231f97bb (patch) | |
| tree | a54f15066574a80231b3a2630b300f0ebc3745c2 /fs/btrfs/free-space-cache.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 | kernel-qcow2-linux-bb9d687618695e8291f1e6209eb3211d231f97bb.tar.gz kernel-qcow2-linux-bb9d687618695e8291f1e6209eb3211d231f97bb.tar.xz kernel-qcow2-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/free-space-cache.c')
| -rw-r--r-- | fs/btrfs/free-space-cache.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c index cfe99bec49de..7c5992d0fd31 100644 --- a/fs/btrfs/free-space-cache.c +++ b/fs/btrfs/free-space-cache.c @@ -1261,7 +1261,7 @@ static int __btrfs_write_out_cache(struct btrfs_root *root, struct inode *inode, goto out; lock_extent_bits(&BTRFS_I(inode)->io_tree, 0, i_size_read(inode) - 1, - 0, &cached_state); + &cached_state); io_ctl_set_generation(io_ctl, trans->transid); |