diff options
author | Wang Shilong | 2013-01-12 10:34:50 +0100 |
---|---|---|
committer | Jan Kara | 2013-01-21 11:19:56 +0100 |
commit | 2b0542a4a0d9b8cb98e64fc87c5e31d130029a92 (patch) | |
tree | f4dceeb8df21b16ffe4fe949816503b15d0fc649 /fs/ext2 | |
parent | Ext3: add necessary check in case IO error happens (diff) | |
download | kernel-qcow2-linux-2b0542a4a0d9b8cb98e64fc87c5e31d130029a92.tar.gz kernel-qcow2-linux-2b0542a4a0d9b8cb98e64fc87c5e31d130029a92.tar.xz kernel-qcow2-linux-2b0542a4a0d9b8cb98e64fc87c5e31d130029a92.zip |
Ext2: use unlikely to improve the efficiency of the kernel
Because the function 'sb_getblk' seldomly fails to return
NULL value. It will be better to use unlikely to optimize it.
Signed-off-by: Wang shilong <wangsl-fnst@cn.fujitsu.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/ext2')
-rw-r--r-- | fs/ext2/super.c | 2 | ||||
-rw-r--r-- | fs/ext2/xattr.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/ext2/super.c b/fs/ext2/super.c index fa04d023177e..7f68c8114026 100644 --- a/fs/ext2/super.c +++ b/fs/ext2/super.c @@ -1500,7 +1500,7 @@ static ssize_t ext2_quota_write(struct super_block *sb, int type, bh = sb_bread(sb, tmp_bh.b_blocknr); else bh = sb_getblk(sb, tmp_bh.b_blocknr); - if (!bh) { + if (unlikely(!bh)) { err = -EIO; goto out; } diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c index b6754dbbce3c..06209ec46152 100644 --- a/fs/ext2/xattr.c +++ b/fs/ext2/xattr.c @@ -662,7 +662,7 @@ ext2_xattr_set2(struct inode *inode, struct buffer_head *old_bh, ea_idebug(inode, "creating block %d", block); new_bh = sb_getblk(sb, block); - if (!new_bh) { + if (unlikely(!new_bh)) { ext2_free_blocks(inode, block, 1); mark_inode_dirty(inode); error = -EIO; |