All of lore.kernel.org
 help / color / mirror / Atom feed
From: Miao Xie <miaox@cn.fujitsu.com>
To: Ilya Dryomov <idryomov@gmail.com>
Cc: Linux Btrfs <linux-btrfs@vger.kernel.org>
Subject: Re: [PATCH 5/5] Btrfs: fix memory leak in btrfs_pause_balance()
Date: Fri, 18 May 2012 11:12:08 +0800	[thread overview]
Message-ID: <4FB5BE08.7030306@cn.fujitsu.com> (raw)
In-Reply-To: <20120517152004.GC1934@zambezi.lan>

On 	thu, 17 May 2012 18:20:04 +0300, Ilya Dryomov wrote:
> On Thu, May 17, 2012 at 07:58:53PM +0800, Miao Xie wrote:
>> We forget to free fs_info->balance_ctl in the btrfs_pause_balance()
>> when umounting the fs.
>>
>> Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>
>> ---
>>  fs/btrfs/volumes.c |    3 +++
>>  1 files changed, 3 insertions(+), 0 deletions(-)
>>
>> diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
>> index c536d52..fd7fe80 100644
>> --- a/fs/btrfs/volumes.c
>> +++ b/fs/btrfs/volumes.c
>> @@ -2937,6 +2937,9 @@ int btrfs_pause_balance(struct btrfs_fs_info *fs_info)
>>  		ret = -ENOTCONN;
>>  	}
>>  
>> +	if (btrfs_fs_closing(fs_info) && fs_info->balance_ctl)
>> +		unset_balance_control(fs_info);
>> +
>>  	mutex_unlock(&fs_info->balance_mutex);
>>  	return ret;
>>  }
> 
> It is kfree()'d in free_fs_info(), which should be called on unmount.
> Am I missing something here ?

It is my mistake. Sorry.

BTW I think freeing it in btrfs_pause_balance() is better because it is relative
to the balance, or the readability will become worse.

Thanks
Miao

      reply	other threads:[~2012-05-18  3:13 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-17 11:58 [PATCH 5/5] Btrfs: fix memory leak in btrfs_pause_balance() Miao Xie
2012-05-17 15:20 ` Ilya Dryomov
2012-05-18  3:12   ` 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=4FB5BE08.7030306@cn.fujitsu.com \
    --to=miaox@cn.fujitsu.com \
    --cc=idryomov@gmail.com \
    --cc=linux-btrfs@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.