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=-6.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY 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 D8F35C3A5A9 for ; Mon, 4 May 2020 18:46:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A4C0E206B9 for ; Mon, 4 May 2020 18:46:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="T4CFgPDx" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726509AbgEDSqc (ORCPT ); Mon, 4 May 2020 14:46:32 -0400 Received: from aserp2120.oracle.com ([141.146.126.78]:44698 "EHLO aserp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726641AbgEDSqc (ORCPT ); Mon, 4 May 2020 14:46:32 -0400 Received: from pps.filterd (aserp2120.oracle.com [127.0.0.1]) by aserp2120.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 044IfT2O045584 for ; Mon, 4 May 2020 18:46:30 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=date : from : to : cc : subject : message-id : references : mime-version : content-type : in-reply-to; s=corp-2020-01-29; bh=DyoSd+4ee669/Tg1YFng8tmYukU4xCvAsWoh2PQnP+I=; b=T4CFgPDxgTEvvnOPvvHszviMBndeawi6DxewtXhq2WOuAi3ETA0PE5mdZLJ3s4LT3ZUn TCP3vHsRAkE6eIVilxxKXiUmI3lLUbDEbXuPHk9FR6FUieCZX4uhF1u+q2NqgO6BTTyi /256zHpowDDqdQ+40GXuSZRFWIuCss+MHC/I0TnMbGtseM+jqod1CYxARRKE6MXoUccY cYKQB0BkrcRtwtoh9bssNtyD/5BTNqgFXr+le6hSJ5qOXXNDUapTO4xnAEC2nYizb+rf Cc3xmrIB4uERpRtk6joo/tM2YYYzWYh8+Qq06Do3Nu3XP2B7yispzXRCjUcfr6e68/M8 NA== Received: from userp3030.oracle.com (userp3030.oracle.com [156.151.31.80]) by aserp2120.oracle.com with ESMTP id 30s0tm8phx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 04 May 2020 18:46:30 +0000 Received: from pps.filterd (userp3030.oracle.com [127.0.0.1]) by userp3030.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 044IbcbU121657 for ; Mon, 4 May 2020 18:46:30 GMT Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by userp3030.oracle.com with ESMTP id 30t1r2xhmu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 04 May 2020 18:46:29 +0000 Received: from abhmp0017.oracle.com (abhmp0017.oracle.com [141.146.116.23]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id 044IkT1W015293 for ; Mon, 4 May 2020 18:46:29 GMT Received: from localhost (/67.169.218.210) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 04 May 2020 11:46:29 -0700 Date: Mon, 4 May 2020 11:46:28 -0700 From: "Darrick J. Wong" To: Allison Collins Cc: linux-xfs@vger.kernel.org Subject: Re: [PATCH v9 14/24] xfs: Add helpers xfs_attr_is_shortform and xfs_attr_set_shortform Message-ID: <20200504184628.GA5703@magnolia> References: <20200430225016.4287-1-allison.henderson@oracle.com> <20200430225016.4287-15-allison.henderson@oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200430225016.4287-15-allison.henderson@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9610 signatures=668687 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 adultscore=0 suspectscore=1 spamscore=0 mlxlogscore=999 malwarescore=0 phishscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2003020000 definitions=main-2005040145 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9610 signatures=668687 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 mlxscore=0 priorityscore=1501 lowpriorityscore=0 spamscore=0 suspectscore=1 phishscore=0 clxscore=1015 bulkscore=0 mlxlogscore=999 adultscore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2003020000 definitions=main-2005040145 Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org On Thu, Apr 30, 2020 at 03:50:06PM -0700, Allison Collins wrote: > In this patch, we hoist code from xfs_attr_set_args into two new helpers > xfs_attr_is_shortform and xfs_attr_set_shortform. These two will help > to simplify xfs_attr_set_args when we get into delayed attrs later. > > Signed-off-by: Allison Collins > Reviewed-by: Brian Foster > Reviewed-by: Chandan Rajendra Looks ok to me, Reviewed-by: Darrick J. Wong --D > --- > fs/xfs/libxfs/xfs_attr.c | 107 +++++++++++++++++++++++++++++++---------------- > 1 file changed, 72 insertions(+), 35 deletions(-) > > diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c > index af47566..d112910 100644 > --- a/fs/xfs/libxfs/xfs_attr.c > +++ b/fs/xfs/libxfs/xfs_attr.c > @@ -204,6 +204,66 @@ xfs_attr_try_sf_addname( > } > > /* > + * Check to see if the attr should be upgraded from non-existent or shortform to > + * single-leaf-block attribute list. > + */ > +static inline bool > +xfs_attr_is_shortform( > + struct xfs_inode *ip) > +{ > + return ip->i_d.di_aformat == XFS_DINODE_FMT_LOCAL || > + (ip->i_d.di_aformat == XFS_DINODE_FMT_EXTENTS && > + ip->i_d.di_anextents == 0); > +} > + > +/* > + * Attempts to set an attr in shortform, or converts short form to leaf form if > + * there is not enough room. If the attr is set, the transaction is committed > + * and set to NULL. > + */ > +STATIC int > +xfs_attr_set_shortform( > + struct xfs_da_args *args, > + struct xfs_buf **leaf_bp) > +{ > + struct xfs_inode *dp = args->dp; > + int error, error2 = 0; > + > + /* > + * Try to add the attr to the attribute list in the inode. > + */ > + error = xfs_attr_try_sf_addname(dp, args); > + if (error != -ENOSPC) { > + error2 = xfs_trans_commit(args->trans); > + args->trans = NULL; > + return error ? error : error2; > + } > + /* > + * It won't fit in the shortform, transform to a leaf block. GROT: > + * another possible req'mt for a double-split btree op. > + */ > + error = xfs_attr_shortform_to_leaf(args, leaf_bp); > + if (error) > + return error; > + > + /* > + * Prevent the leaf buffer from being unlocked so that a concurrent AIL > + * push cannot grab the half-baked leaf buffer and run into problems > + * with the write verifier. Once we're done rolling the transaction we > + * can release the hold and add the attr to the leaf. > + */ > + xfs_trans_bhold(args->trans, *leaf_bp); > + error = xfs_defer_finish(&args->trans); > + xfs_trans_bhold_release(args->trans, *leaf_bp); > + if (error) { > + xfs_trans_brelse(args->trans, *leaf_bp); > + return error; > + } > + > + return 0; > +} > + > +/* > * Set the attribute specified in @args. > */ > int > @@ -212,48 +272,25 @@ xfs_attr_set_args( > { > struct xfs_inode *dp = args->dp; > struct xfs_buf *leaf_bp = NULL; > - int error, error2 = 0; > + int error = 0; > > /* > - * If the attribute list is non-existent or a shortform list, > - * upgrade it to a single-leaf-block attribute list. > + * If the attribute list is already in leaf format, jump straight to > + * leaf handling. Otherwise, try to add the attribute to the shortform > + * list; if there's no room then convert the list to leaf format and try > + * again. > */ > - if (dp->i_d.di_aformat == XFS_DINODE_FMT_LOCAL || > - (dp->i_d.di_aformat == XFS_DINODE_FMT_EXTENTS && > - dp->i_d.di_anextents == 0)) { > + if (xfs_attr_is_shortform(dp)) { > > /* > - * Try to add the attr to the attribute list in the inode. > + * If the attr was successfully set in shortform, the > + * transaction is committed and set to NULL. Otherwise, is it > + * converted from shortform to leaf, and the transaction is > + * retained. > */ > - error = xfs_attr_try_sf_addname(dp, args); > - if (error != -ENOSPC) { > - error2 = xfs_trans_commit(args->trans); > - args->trans = NULL; > - return error ? error : error2; > - } > - > - /* > - * It won't fit in the shortform, transform to a leaf block. > - * GROT: another possible req'mt for a double-split btree op. > - */ > - error = xfs_attr_shortform_to_leaf(args, &leaf_bp); > - if (error) > - return error; > - > - /* > - * Prevent the leaf buffer from being unlocked so that a > - * concurrent AIL push cannot grab the half-baked leaf > - * buffer and run into problems with the write verifier. > - * Once we're done rolling the transaction we can release > - * the hold and add the attr to the leaf. > - */ > - xfs_trans_bhold(args->trans, leaf_bp); > - error = xfs_defer_finish(&args->trans); > - xfs_trans_bhold_release(args->trans, leaf_bp); > - if (error) { > - xfs_trans_brelse(args->trans, leaf_bp); > + error = xfs_attr_set_shortform(args, &leaf_bp); > + if (error || !args->trans) > return error; > - } > } > > if (xfs_bmap_one_block(dp, XFS_ATTR_FORK)) { > -- > 2.7.4 >