From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from userp2120.oracle.com ([156.151.31.85]:45702 "EHLO userp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726681AbfHLTbT (ORCPT ); Mon, 12 Aug 2019 15:31:19 -0400 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x7CJE3cR112969 for ; Mon, 12 Aug 2019 19:31:17 GMT Received: from userp3020.oracle.com (userp3020.oracle.com [156.151.31.79]) by userp2120.oracle.com with ESMTP id 2u9pjq9ndd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 12 Aug 2019 19:31:17 +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 x7CJDHEQ147582 for ; Mon, 12 Aug 2019 19:31:17 GMT Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by userp3020.oracle.com with ESMTP id 2u9n9h8bka-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 12 Aug 2019 19:31:17 +0000 Received: from abhmp0022.oracle.com (abhmp0022.oracle.com [141.146.116.28]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id x7CJVGoq031279 for ; Mon, 12 Aug 2019 19:31:16 GMT Subject: Re: [PATCH v2 07/18] xfs: Factor up trans handling in xfs_attr3_leaf_flipflags References: <20190809213726.32336-1-allison.henderson@oracle.com> <20190809213726.32336-8-allison.henderson@oracle.com> <20190812160252.GV7138@magnolia> <20190812163007.GC7138@magnolia> From: Allison Collins Message-ID: Date: Mon, 12 Aug 2019 12:31:15 -0700 MIME-Version: 1.0 In-Reply-To: <20190812163007.GC7138@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:30 AM, Darrick J. Wong wrote: > On Mon, Aug 12, 2019 at 09:02:52AM -0700, Darrick J. Wong wrote: >> On Fri, Aug 09, 2019 at 02:37:15PM -0700, Allison Collins wrote: >>> Since delayed operations cannot roll transactions, factor >>> up the transaction handling into the calling function >>> >>> Signed-off-by: Allison Collins >> >> Looks ok, >> Reviewed-by: Darrick J. Wong > > No, not ok! > >>> --- >>> fs/xfs/libxfs/xfs_attr.c | 10 ++++++++++ >>> fs/xfs/libxfs/xfs_attr_leaf.c | 5 ----- >>> 2 files changed, 10 insertions(+), 5 deletions(-) >>> >>> diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c >>> index 72af8e2..f36c792 100644 >>> --- a/fs/xfs/libxfs/xfs_attr.c >>> +++ b/fs/xfs/libxfs/xfs_attr.c >>> @@ -752,6 +752,11 @@ xfs_attr_leaf_addname( >>> error = xfs_attr3_leaf_flipflags(args); >>> if (error) >>> return error; >>> + /* >>> + * Commit the flag value change and start the next trans in >>> + * series. >>> + */ >>> + error = xfs_trans_roll_inode(&args->trans, args->dp); > > Lost error value here! > >>> >>> /* >>> * Dismantle the "old" attribute/value pair by removing >>> @@ -1090,6 +1095,11 @@ xfs_attr_node_addname( >>> error = xfs_attr3_leaf_flipflags(args); >>> if (error) >>> goto out; >>> + /* >>> + * Commit the flag value change and start the next trans in >>> + * series >>> + */ >>> + error = xfs_trans_roll_inode(&args->trans, args->dp); > > And here! > > --D Sorry about that! Thanks for the catch! Will add in the error code handlers. Allison > >>> >>> /* >>> * Dismantle the "old" attribute/value pair by removing >>> diff --git a/fs/xfs/libxfs/xfs_attr_leaf.c b/fs/xfs/libxfs/xfs_attr_leaf.c >>> index 8d2e11f..8a6f5df 100644 >>> --- a/fs/xfs/libxfs/xfs_attr_leaf.c >>> +++ b/fs/xfs/libxfs/xfs_attr_leaf.c >>> @@ -2891,10 +2891,5 @@ xfs_attr3_leaf_flipflags( >>> XFS_DA_LOGRANGE(leaf2, name_rmt, sizeof(*name_rmt))); >>> } >>> >>> - /* >>> - * Commit the flag value change and start the next trans in series. >>> - */ >>> - error = xfs_trans_roll_inode(&args->trans, args->dp); >>> - >>> return error; >>> } >>> -- >>> 2.7.4 >>>