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 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 04206C47247 for ; Tue, 5 May 2020 12:03:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D1185206B9 for ; Tue, 5 May 2020 12:03:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="H7YwZNew" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727090AbgEEMDU (ORCPT ); Tue, 5 May 2020 08:03:20 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:44635 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728627AbgEEMDU (ORCPT ); Tue, 5 May 2020 08:03:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588680198; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=jW6dkDuLVcPzMsdhnnWrEvsl0h9GXod1RZMv6ulNPzc=; b=H7YwZNew69PLnBDbRw5QEW+a1bpl16VY3d+J0SZSS9+tLVu74WI2I+r47cNQqw30q99kaL tST6c+e6MxbuZB5cVoyWbN1b5VAfux2AQXV5kSk9cyQInpEXs6EX4vM5qHqd903Tqjun8Q xncg+8MNMy1n58GHniGsx+/8S7WXFW0= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-199-S7MCdJmzMJCtg-IsYZzQrA-1; Tue, 05 May 2020 08:03:16 -0400 X-MC-Unique: S7MCdJmzMJCtg-IsYZzQrA-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D955F80183C; Tue, 5 May 2020 12:03:15 +0000 (UTC) Received: from bfoster (dhcp-41-2.bos.redhat.com [10.18.41.2]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7DA9C5D9D3; Tue, 5 May 2020 12:03:15 +0000 (UTC) Date: Tue, 5 May 2020 08:03:13 -0400 From: Brian Foster To: Allison Collins Cc: linux-xfs@vger.kernel.org Subject: Re: [PATCH v9 10/24] xfs: Add helper function __xfs_attr_rmtval_remove Message-ID: <20200505120313.GB60048@bfoster> References: <20200430225016.4287-1-allison.henderson@oracle.com> <20200430225016.4287-11-allison.henderson@oracle.com> <20200504132722.GA54625@bfoster> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org On Mon, May 04, 2020 at 02:36:39PM -0700, Allison Collins wrote: > > > On 5/4/20 6:27 AM, Brian Foster wrote: > > On Thu, Apr 30, 2020 at 03:50:02PM -0700, Allison Collins wrote: > > > This function is similar to xfs_attr_rmtval_remove, but adapted to > > > return EAGAIN for new transactions. We will use this later when we > > > introduce delayed attributes. This function will eventually replace > > > xfs_attr_rmtval_remove > > > > > > Signed-off-by: Allison Collins > > > Reviewed-by: Chandan Rajendra > > > --- > > > > Looks like the commit log needs some rewording now that this is a > > refactor patch. With that fixed: > Ok, maybe just an extra line like "Refactor xfs_attr_rmtval_remove to add > helper function __xfs_attr_rmtval_remove" ? > I'd update the first sentence to say something like that instead of how the function is similar to xfs_attr_rmtval_remove(). Brian > > > > Reviewed-by: Brian Foster > Alrighty, thank you! > > Allison > > > > > > fs/xfs/libxfs/xfs_attr_remote.c | 46 ++++++++++++++++++++++++++++++++--------- > > > fs/xfs/libxfs/xfs_attr_remote.h | 1 + > > > 2 files changed, 37 insertions(+), 10 deletions(-) > > > > > > diff --git a/fs/xfs/libxfs/xfs_attr_remote.c b/fs/xfs/libxfs/xfs_attr_remote.c > > > index 4d51969..02d1a44 100644 > > > --- a/fs/xfs/libxfs/xfs_attr_remote.c > > > +++ b/fs/xfs/libxfs/xfs_attr_remote.c > > > @@ -681,7 +681,7 @@ xfs_attr_rmtval_remove( > > > xfs_dablk_t lblkno; > > > int blkcnt; > > > int error = 0; > > > - int done = 0; > > > + int retval = 0; > > > trace_xfs_attr_rmtval_remove(args); > > > @@ -693,14 +693,10 @@ xfs_attr_rmtval_remove( > > > */ > > > lblkno = args->rmtblkno; > > > blkcnt = args->rmtblkcnt; > > > - while (!done) { > > > - error = xfs_bunmapi(args->trans, args->dp, lblkno, blkcnt, > > > - XFS_BMAPI_ATTRFORK, 1, &done); > > > - if (error) > > > - return error; > > > - error = xfs_defer_finish(&args->trans); > > > - if (error) > > > - return error; > > > + do { > > > + retval = __xfs_attr_rmtval_remove(args); > > > + if (retval && retval != EAGAIN) > > > + return retval; > > > /* > > > * Close out trans and start the next one in the chain. > > > @@ -708,6 +704,36 @@ xfs_attr_rmtval_remove( > > > error = xfs_trans_roll_inode(&args->trans, args->dp); > > > if (error) > > > return error; > > > - } > > > + } while (retval == -EAGAIN); > > > + > > > return 0; > > > } > > > + > > > +/* > > > + * Remove the value associated with an attribute by deleting the out-of-line > > > + * buffer that it is stored on. Returns EAGAIN for the caller to refresh the > > > + * transaction and recall the function > > > + */ > > > +int > > > +__xfs_attr_rmtval_remove( > > > + struct xfs_da_args *args) > > > +{ > > > + int error, done; > > > + > > > + /* > > > + * Unmap value blocks for this attr. > > > + */ > > > + error = xfs_bunmapi(args->trans, args->dp, args->rmtblkno, > > > + args->rmtblkcnt, XFS_BMAPI_ATTRFORK, 1, &done); > > > + if (error) > > > + return error; > > > + > > > + error = xfs_defer_finish(&args->trans); > > > + if (error) > > > + return error; > > > + > > > + if (!done) > > > + return -EAGAIN; > > > + > > > + return error; > > > +} > > > diff --git a/fs/xfs/libxfs/xfs_attr_remote.h b/fs/xfs/libxfs/xfs_attr_remote.h > > > index eff5f95..ee3337b 100644 > > > --- a/fs/xfs/libxfs/xfs_attr_remote.h > > > +++ b/fs/xfs/libxfs/xfs_attr_remote.h > > > @@ -14,4 +14,5 @@ int xfs_attr_rmtval_remove(struct xfs_da_args *args); > > > int xfs_attr_rmtval_stale(struct xfs_inode *ip, struct xfs_bmbt_irec *map, > > > xfs_buf_flags_t incore_flags); > > > int xfs_attr_rmtval_invalidate(struct xfs_da_args *args); > > > +int __xfs_attr_rmtval_remove(struct xfs_da_args *args); > > > #endif /* __XFS_ATTR_REMOTE_H__ */ > > > -- > > > 2.7.4 > > > > > >