From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 740C6C43603 for ; Mon, 16 Dec 2019 09:22:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 43C7520725 for ; Mon, 16 Dec 2019 09:22:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727039AbfLPJWZ (ORCPT ); Mon, 16 Dec 2019 04:22:25 -0500 Received: from szxga05-in.huawei.com ([45.249.212.191]:7248 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727035AbfLPJWZ (ORCPT ); Mon, 16 Dec 2019 04:22:25 -0500 Received: from DGGEMS407-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id C912240E73482E47C8B; Mon, 16 Dec 2019 17:22:22 +0800 (CST) Received: from [10.177.249.225] (10.177.249.225) by smtp.huawei.com (10.3.19.207) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 16 Dec 2019 17:22:17 +0800 Reply-To: Subject: Re: [PATCH] ext4: unlock on error in ext4_expand_extra_isize() To: Dan Carpenter , Theodore Ts'o CC: Andreas Dilger , , References: <20191213185010.6k7yl2tck3wlsdkt@kili.mountain> From: Miao Xie Organization: Huawei Technologies Co., LTD. Message-ID: <5b8569d5-9fbe-0bcf-8fcc-852ded7cd672@huawei.com> Date: Mon, 16 Dec 2019 17:22:17 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0 MIME-Version: 1.0 In-Reply-To: <20191213185010.6k7yl2tck3wlsdkt@kili.mountain> Content-Type: text/plain; charset="gbk" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.177.249.225] X-CFilter-Loop: Reflected Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org Hi, Dan Carpenter I forgot to reply your mail because I'm busy recently. Sorry. Thanks for your fix. Regards Miao on 2019/12/14 at 2:50, Dan Carpenter wrote: > We need to unlock the xattr before returning on this error path. > > Fixes: c03b45b853f5 ("ext4, project: expand inode extra size if possible") > Signed-off-by: Dan Carpenter > --- > fs/ext4/inode.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c > index 28f28de0c1b6..629a25d999f0 100644 > --- a/fs/ext4/inode.c > +++ b/fs/ext4/inode.c > @@ -5692,7 +5692,7 @@ int ext4_expand_extra_isize(struct inode *inode, > error = ext4_journal_get_write_access(handle, iloc->bh); > if (error) { > brelse(iloc->bh); > - goto out_stop; > + goto out_unlock; > } > > error = __ext4_expand_extra_isize(inode, new_extra_isize, iloc, > @@ -5702,8 +5702,8 @@ int ext4_expand_extra_isize(struct inode *inode, > if (!error) > error = rc; > > +out_unlock: > ext4_write_unlock_xattr(inode, &no_expand); > -out_stop: > ext4_journal_stop(handle); > return error; > } > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Miao Xie Date: Mon, 16 Dec 2019 09:22:17 +0000 Subject: Re: [PATCH] ext4: unlock on error in ext4_expand_extra_isize() Message-Id: <5b8569d5-9fbe-0bcf-8fcc-852ded7cd672@huawei.com> List-Id: References: <20191213185010.6k7yl2tck3wlsdkt@kili.mountain> In-Reply-To: <20191213185010.6k7yl2tck3wlsdkt@kili.mountain> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Dan Carpenter , Theodore Ts'o Cc: Andreas Dilger , linux-ext4@vger.kernel.org, kernel-janitors@vger.kernel.org Hi, Dan Carpenter I forgot to reply your mail because I'm busy recently. Sorry. Thanks for your fix. Regards Miao on 2019/12/14 at 2:50, Dan Carpenter wrote: > We need to unlock the xattr before returning on this error path. > > Fixes: c03b45b853f5 ("ext4, project: expand inode extra size if possible") > Signed-off-by: Dan Carpenter > --- > fs/ext4/inode.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c > index 28f28de0c1b6..629a25d999f0 100644 > --- a/fs/ext4/inode.c > +++ b/fs/ext4/inode.c > @@ -5692,7 +5692,7 @@ int ext4_expand_extra_isize(struct inode *inode, > error = ext4_journal_get_write_access(handle, iloc->bh); > if (error) { > brelse(iloc->bh); > - goto out_stop; > + goto out_unlock; > } > > error = __ext4_expand_extra_isize(inode, new_extra_isize, iloc, > @@ -5702,8 +5702,8 @@ int ext4_expand_extra_isize(struct inode *inode, > if (!error) > error = rc; > > +out_unlock: > ext4_write_unlock_xattr(inode, &no_expand); > -out_stop: > ext4_journal_stop(handle); > return error; > } >