Merge branch 'remove-unlikely' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus

This commit is contained in:
Chris Mason
2014-10-04 09:57:44 -07:00
6 changed files with 16 additions and 16 deletions

View File

@@ -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);
}