From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from userp2130.oracle.com ([156.151.31.86]:48520 "EHLO userp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726488AbfHLWjF (ORCPT ); Mon, 12 Aug 2019 18:39:05 -0400 Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x7CMYFBp062058 for ; Mon, 12 Aug 2019 22:39:04 GMT Received: from userp3020.oracle.com (userp3020.oracle.com [156.151.31.79]) by userp2130.oracle.com with ESMTP id 2u9nbtagn7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 12 Aug 2019 22:39:04 +0000 Received: from pps.filterd (userp3020.oracle.com [127.0.0.1]) by userp3020.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x7CMd3pn070618 for ; Mon, 12 Aug 2019 22:39:03 GMT Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by userp3020.oracle.com with ESMTP id 2u9n9hdq8c-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 12 Aug 2019 22:39:02 +0000 Received: from abhmp0004.oracle.com (abhmp0004.oracle.com [141.146.116.10]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id x7CMcrWw021948 for ; Mon, 12 Aug 2019 22:38:53 GMT From: Allison Collins Subject: Re: [PATCH v2 10/18] xfs: Factor up trans roll from xfs_attr3_leaf_setflag References: <20190809213726.32336-1-allison.henderson@oracle.com> <20190809213726.32336-11-allison.henderson@oracle.com> <20190812161452.GY7138@magnolia> Message-ID: <2d8baf51-f4ba-e5a7-46bf-bb7350bbc0d2@oracle.com> Date: Mon, 12 Aug 2019 15:38:51 -0700 MIME-Version: 1.0 In-Reply-To: <20190812161452.GY7138@magnolia> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-xfs-owner@vger.kernel.org List-ID: List-Id: xfs To: "Darrick J. Wong" Cc: linux-xfs@vger.kernel.org On 8/12/19 9:14 AM, Darrick J. Wong wrote: > On Fri, Aug 09, 2019 at 02:37:18PM -0700, Allison Collins wrote: >> New delayed allocation routines cannot be handling >> transactions so factor them up into the calling functions >> >> Signed-off-by: Allison Collins > > Looks ok, > Reviewed-by: Darrick J. Wong Great! Thanks! Allison > > --D > >> --- >> fs/xfs/libxfs/xfs_attr.c | 5 +++++ >> fs/xfs/libxfs/xfs_attr_leaf.c | 5 +---- >> 2 files changed, 6 insertions(+), 4 deletions(-) >> >> diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c >> index 6bd87e6..7648ceb 100644 >> --- a/fs/xfs/libxfs/xfs_attr.c >> +++ b/fs/xfs/libxfs/xfs_attr.c >> @@ -1239,6 +1239,11 @@ xfs_attr_node_removename( >> error = xfs_attr3_leaf_setflag(args); >> if (error) >> goto out; >> + >> + error = xfs_trans_roll_inode(&args->trans, args->dp); >> + if (error) >> + goto out; >> + >> error = xfs_attr_rmtval_remove(args); >> if (error) >> goto out; >> diff --git a/fs/xfs/libxfs/xfs_attr_leaf.c b/fs/xfs/libxfs/xfs_attr_leaf.c >> index 8a6f5df..4a22ced 100644 >> --- a/fs/xfs/libxfs/xfs_attr_leaf.c >> +++ b/fs/xfs/libxfs/xfs_attr_leaf.c >> @@ -2773,10 +2773,7 @@ xfs_attr3_leaf_setflag( >> XFS_DA_LOGRANGE(leaf, name_rmt, sizeof(*name_rmt))); >> } >> >> - /* >> - * Commit the flag value change and start the next trans in series. >> - */ >> - return xfs_trans_roll_inode(&args->trans, args->dp); >> + return error; >> } >> >> /* >> -- >> 2.7.4 >>