All of lore.kernel.org
 help / color / mirror / Atom feed
From: Miao Xie <miaox@cn.fujitsu.com>
To: bo.li.liu@oracle.com
Cc: Andi Shyti <andi@etezian.org>,
	chris.mason@fusionio.com, linux-btrfs@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: Re: [PATCH] btrfs: raid56: avoid double allocation
Date: Thu, 25 Jul 2013 16:26:56 +0800	[thread overview]
Message-ID: <51F0E150.6080203@cn.fujitsu.com> (raw)
In-Reply-To: <20130725081840.GB5202@localhost.localdomain>

On 	thu, 25 Jul 2013 16:18:41 +0800, Liu Bo wrote:
> On Thu, Jul 25, 2013 at 02:09:40AM +0200, Andi Shyti wrote:
>> alloc_rbio frees already bbio and raid_map, therefore they don't
>> need to be freed in case it fails
>>
> 
> Looks good to me.
> 
> Reviewed-by: Liu Bo <bo.li.liu@oracle.com>

Dan Carpenter has fixed this problem in patch
https://patchwork.kernel.org/patch/2831091/

Thanks
Miao

> 
>> Signed-off-by: Andi Shyti <andi@etezian.org>
>> ---
>>  fs/btrfs/raid56.c | 6 ++----
>>  1 file changed, 2 insertions(+), 4 deletions(-)
>>
>> diff --git a/fs/btrfs/raid56.c b/fs/btrfs/raid56.c
>> index 0525e13..35fe775 100644
>> --- a/fs/btrfs/raid56.c
>> +++ b/fs/btrfs/raid56.c
>> @@ -1687,11 +1687,9 @@ int raid56_parity_write(struct btrfs_root *root, struct bio *bio,
>>  	struct blk_plug_cb *cb;
>>  
>>  	rbio = alloc_rbio(root, bbio, raid_map, stripe_len);
>> -	if (IS_ERR(rbio)) {
>> -		kfree(raid_map);
>> -		kfree(bbio);
>> +	if (IS_ERR(rbio))
>>  		return PTR_ERR(rbio);
>> -	}
>> +
>>  	bio_list_add(&rbio->bio_list, bio);
>>  	rbio->bio_list_bytes = bio->bi_size;
>>  
>> -- 
>> 1.8.3.2
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>> Please read the FAQ at  http://www.tux.org/lkml/
> -liubo
> --
> To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 


      reply	other threads:[~2013-07-25  8:25 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-25  0:09 [PATCH] btrfs: raid56: avoid double allocation Andi Shyti
2013-07-25  8:18 ` Liu Bo
2013-07-25  8:26   ` Miao Xie [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=51F0E150.6080203@cn.fujitsu.com \
    --to=miaox@cn.fujitsu.com \
    --cc=andi@etezian.org \
    --cc=bo.li.liu@oracle.com \
    --cc=chris.mason@fusionio.com \
    --cc=linux-btrfs@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.