UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Ext3: 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 check it.

Signed-off-by: Wang Shilong <wangsl-fnst@cn.fujitsu.com>
Signed-off-by: Jan Kara <jack@suse.cz>
This commit is contained in:
Wang Shilong 2013-01-12 01:36:17 -08:00 committed by Jan Kara
parent 2b0542a4a0
commit 1b7d76e9b1
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/ext3/inode.c
View File

@ -1082,7 +1082,7 @@ struct buffer_head *ext3_getblk(handle_t *handle, struct inode *inode,
if (!err && buffer_mapped(&dummy)) { if (!err && buffer_mapped(&dummy)) {
struct buffer_head *bh; struct buffer_head *bh;
bh = sb_getblk(inode->i_sb, dummy.b_blocknr); bh = sb_getblk(inode->i_sb, dummy.b_blocknr);
if (!bh) { if (unlikely(!bh)) {
*errp = -EIO; *errp = -EIO;
goto err; goto err;
} }
@ -2733,7 +2733,7 @@ static int __ext3_get_inode_loc(struct inode *inode,
return -EIO; return -EIO;
bh = sb_getblk(inode->i_sb, block); bh = sb_getblk(inode->i_sb, block);
if (!bh) { if (unlikely(!bh)) {
ext3_error (inode->i_sb, "ext3_get_inode_loc", ext3_error (inode->i_sb, "ext3_get_inode_loc",
"unable to read inode block - " "unable to read inode block - "
"inode=%lu, block="E3FSBLK, "inode=%lu, block="E3FSBLK,
@ -2787,7 +2787,7 @@ static int __ext3_get_inode_loc(struct inode *inode,
bitmap_bh = sb_getblk(inode->i_sb, bitmap_bh = sb_getblk(inode->i_sb,
le32_to_cpu(desc->bg_inode_bitmap)); le32_to_cpu(desc->bg_inode_bitmap));
if (!bitmap_bh) if (unlikely(!bitmap_bh))
goto make_io; goto make_io;
/* /*

6
fs/ext3/resize.c
View File

@ -116,7 +116,7 @@ static struct buffer_head *bclean(handle_t *handle, struct super_block *sb,
int err; int err;
bh = sb_getblk(sb, blk); bh = sb_getblk(sb, blk);
if (!bh) if (unlikely(!bh))
return ERR_PTR(-EIO); return ERR_PTR(-EIO);
if ((err = ext3_journal_get_write_access(handle, bh))) { if ((err = ext3_journal_get_write_access(handle, bh))) {
brelse(bh); brelse(bh);
@ -234,7 +234,7 @@ static int setup_new_group_blocks(struct super_block *sb,
goto exit_bh; goto exit_bh;
gdb = sb_getblk(sb, block); gdb = sb_getblk(sb, block);
if (!gdb) { if (unlikely(!gdb)) {
err = -EIO; err = -EIO;
goto exit_bh; goto exit_bh;
} }
@ -722,7 +722,7 @@ static void update_backups(struct super_block *sb,
break; break;
bh = sb_getblk(sb, group * bpg + blk_off); bh = sb_getblk(sb, group * bpg + blk_off);
if (!bh) { if (unlikely(!bh)) {
err = -EIO; err = -EIO;
break; break;
} }

2
fs/ext3/xattr.c
View File

@ -813,7 +813,7 @@ inserted:
ea_idebug(inode, "creating block %d", block); ea_idebug(inode, "creating block %d", block);
new_bh = sb_getblk(sb, block); new_bh = sb_getblk(sb, block);
if (!new_bh) { if (unlikely(!new_bh)) {
getblk_failed: getblk_failed:
ext3_free_blocks(handle, inode, block, 1); ext3_free_blocks(handle, inode, block, 1);
error = -EIO; error = -EIO;