Commit 1b7d76e9 authored by Wang Shilong's avatar Wang Shilong Committed by Jan Kara
Browse files

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: default avatarWang Shilong <wangsl-fnst@cn.fujitsu.com>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent 2b0542a4

fs/ext3/inode.c

+3 −3
Original line number Diff line number Diff line
@@ -1082,7 +1082,7 @@ struct buffer_head *ext3_getblk(handle_t *handle, struct inode *inode, 
	if (!err && buffer_mapped(&dummy)) {

		struct buffer_head *bh;

		bh = sb_getblk(inode->i_sb, dummy.b_blocknr);

		if (!bh) {

		if (unlikely(!bh)) {

			*errp = -EIO;

			goto err;

		}
@@ -2733,7 +2733,7 @@ static int __ext3_get_inode_loc(struct inode *inode, 
		return -EIO;



	bh = sb_getblk(inode->i_sb, block);

	if (!bh) {

	if (unlikely(!bh)) {

		ext3_error (inode->i_sb, "ext3_get_inode_loc",

				"unable to read inode block - "

				"inode=%lu, block="E3FSBLK,
@@ -2787,7 +2787,7 @@ static int __ext3_get_inode_loc(struct inode *inode, 


			bitmap_bh = sb_getblk(inode->i_sb,

					le32_to_cpu(desc->bg_inode_bitmap));

			if (!bitmap_bh)

			if (unlikely(!bitmap_bh))

				goto make_io;



			/*

fs/ext3/resize.c

+3 −3
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ static struct buffer_head *bclean(handle_t *handle, struct super_block *sb, 
	int err;



	bh = sb_getblk(sb, blk);

	if (!bh)

	if (unlikely(!bh))

		return ERR_PTR(-EIO);

	if ((err = ext3_journal_get_write_access(handle, bh))) {

		brelse(bh);
@@ -234,7 +234,7 @@ static int setup_new_group_blocks(struct super_block *sb, 
			goto exit_bh;



		gdb = sb_getblk(sb, block);

		if (!gdb) {

		if (unlikely(!gdb)) {

			err = -EIO;

			goto exit_bh;

		}
@@ -722,7 +722,7 @@ static void update_backups(struct super_block *sb, 
			break;



		bh = sb_getblk(sb, group * bpg + blk_off);

		if (!bh) {

		if (unlikely(!bh)) {

			err = -EIO;

			break;

		}

fs/ext3/xattr.c

+1 −1
Original line number Diff line number Diff line
@@ -813,7 +813,7 @@ ext3_xattr_block_set(handle_t *handle, struct inode *inode, 
			ea_idebug(inode, "creating block %d", block);



			new_bh = sb_getblk(sb, block);

			if (!new_bh) {

			if (unlikely(!new_bh)) {

getblk_failed:

				ext3_free_blocks(handle, inode, block, 1);

				error = -EIO;