diff options
| author | Chris Mason <clm@fb.com> | 2014-10-04 09:57:44 -0700 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2014-10-04 09:57:44 -0700 |
| commit | 0ec31a61f0d46e03e9e80c2ff57fa3ae2fdf92d3 (patch) | |
| tree | cb56a470a5b8ed52cde9417d7bfa6f94349b4c38 /fs/btrfs/ioctl.c | |
| parent | 27b19cc8864e206c4203041892b0f706f044a0f1 (diff) | |
| parent | ee39b432b4ac083acdafd7b4f156283722e3bf14 (diff) | |
| download | op-kernel-dev-0ec31a61f0d46e03e9e80c2ff57fa3ae2fdf92d3.zip op-kernel-dev-0ec31a61f0d46e03e9e80c2ff57fa3ae2fdf92d3.tar.gz | |
Merge branch 'remove-unlikely' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus
Diffstat (limited to 'fs/btrfs/ioctl.c')
| -rw-r--r-- | fs/btrfs/ioctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index fd9d190..e732274 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -3166,7 +3166,7 @@ static void clone_update_extent_map(struct inode *inode, em->start + em->len - 1, 0); } - if (unlikely(ret)) + if (ret) set_bit(BTRFS_INODE_NEEDS_FULL_SYNC, &BTRFS_I(inode)->runtime_flags); } |
