On Sat 12-01-13 01:34:50, shilong wang wrote:
> From: Wang Shilong <wangsl-fnst@xxxxxxxxxxxxxx>
>
> Because the function 'sb_getblk' seldomly fails to return
> NULL value. It will be better to use unlikely to optimize it.
Thanks, I've merged the patch. But your mailer has apparently wrapped
lines in the patch so I had to fix it up. Please either use mailer that
doesn't wrap lines or send patches as text/plain attachments. Thanks!
Honza
>
> Signed-off-by: Wang shilong <wangsl-fnst@xxxxxxxxxxxxxx>
> ---
> fs/ext2/super.c | 2 +-
> 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 af74d9e..c0f4fc6 100644
> --- a/fs/ext2/super.c
> +++ b/fs/ext2/super.c
> @@ -1495,7 +1495,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 b6754db..06209ec 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;
> --
> 1.7.7.6
--
Jan Kara <jack@xxxxxxx>
SUSE Labs, CR
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
