From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from userp1040.oracle.com ([156.151.31.81]:21142 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751765AbcICBIo (ORCPT ); Fri, 2 Sep 2016 21:08:44 -0400 Date: Fri, 2 Sep 2016 18:08:35 -0700 From: Liu Bo To: Josef Bacik Cc: linux-btrfs@vger.kernel.org Subject: Re: [PATCH] Btrfs: don't leak reloc root nodes on error Message-ID: <20160903010827.GA7758@localhost.localdomain> Reply-To: bo.li.liu@oracle.com References: <1472844343-19086-1-git-send-email-jbacik@fb.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <1472844343-19086-1-git-send-email-jbacik@fb.com> Sender: linux-btrfs-owner@vger.kernel.org List-ID: On Fri, Sep 02, 2016 at 03:25:43PM -0400, Josef Bacik wrote: > We don't track the reloc roots in any sort of normal way, so the only way the > root/commit_root nodes get free'd is if the relocation finishes successfully and > the reloc root is deleted. Fix this by free'ing them in free_reloc_roots. > Thanks, Looks good. > > Signed-off-by: Josef Bacik > --- > fs/btrfs/relocation.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c > index 7fc6ea7..62dfc2c 100644 > --- a/fs/btrfs/relocation.c > +++ b/fs/btrfs/relocation.c > @@ -2349,6 +2349,10 @@ void free_reloc_roots(struct list_head *list) > while (!list_empty(list)) { > reloc_root = list_entry(list->next, struct btrfs_root, > root_list); > + free_extent_buffer(reloc_root->node); > + free_extent_buffer(reloc_root->commit_root); > + reloc_root->node = NULL; > + reloc_root->commit_root = NULL; What about reloc_root itself? Thanks, -liubo > __del_reloc_root(reloc_root); > } > } > -- > 2.7.4 > > -- > 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