From patchwork Thu Apr 6 19:34:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 13203973 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 55C9FC76196 for ; Thu, 6 Apr 2023 19:34:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236961AbjDFTeW (ORCPT ); Thu, 6 Apr 2023 15:34:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35136 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237133AbjDFTeQ (ORCPT ); Thu, 6 Apr 2023 15:34:16 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E82745580 for ; Thu, 6 Apr 2023 12:34:11 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 7F8DF64B8E for ; Thu, 6 Apr 2023 19:34:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DA4F0C4339E; Thu, 6 Apr 2023 19:34:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1680809650; bh=UFt1+l/dY+xUFZte5+9jCs9c33ASKJThrcpVRG19Jo0=; h=Date:Subject:From:To:Cc:In-Reply-To:References:From; b=M+WZNPtv1DKuhfRCTBdTr3k1CqgH13pAq113mruKT4DmG7QBFi0iaseVgo0/GX+W2 h6uihs+arkOQMQH5c4M/jFP9qCUEaa1qp239reEeA8Wh8P9Vvft2V7b7ASm2l8lyUF UkI9F6tPvTGAn8z/pGgNho4X3v9Kyqkqz6dfsAAqGdFN+n7v6ncowi6aUEuyDN5rfv ZVy977+OjwOUazZNjeG5YyImDUCNh83KaKaVa0iXnbQ964LRgbTnB+ixRNjoGb6yUu cZYhEWCM+FMPWdjaMAB4uEL6tw0bK7LjelufoePi7UFih1dFlGksBc0L+fue/Kbwei Dyv2ExAK5kxNw== Date: Thu, 06 Apr 2023 12:34:10 -0700 Subject: [PATCH 10/32] xfs: Add parent pointers to rename From: "Darrick J. Wong" To: djwong@kernel.org Cc: Allison Henderson , allison.henderson@oracle.com, linux-xfs@vger.kernel.org Message-ID: <168080827689.616793.1739964310813468288.stgit@frogsfrogsfrogs> In-Reply-To: <168080827546.616793.7264157843231723676.stgit@frogsfrogsfrogs> References: <168080827546.616793.7264157843231723676.stgit@frogsfrogsfrogs> User-Agent: StGit/0.19 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org From: Allison Henderson This patch removes the old parent pointer attribute during the rename operation, and re-adds the updated parent pointer. Signed-off-by: Allison Henderson Reviewed-by: Darrick J. Wong [djwong: adjust to new ondisk format] Signed-off-by: Darrick J. Wong --- libxfs/xfs_attr.c | 2 +- libxfs/xfs_attr.h | 1 + libxfs/xfs_parent.c | 58 ++++++++++++++++++++++++++++++++++++++++++---- libxfs/xfs_parent.h | 23 +++++++++++++++++- libxfs/xfs_trans_space.h | 2 -- 5 files changed, 76 insertions(+), 10 deletions(-) diff --git a/libxfs/xfs_attr.c b/libxfs/xfs_attr.c index 30d1a2992..5a713f612 100644 --- a/libxfs/xfs_attr.c +++ b/libxfs/xfs_attr.c @@ -934,7 +934,7 @@ xfs_attr_defer_add( } /* Sets an attribute for an inode as a deferred operation */ -static int +int xfs_attr_defer_replace( struct xfs_da_args *args) { diff --git a/libxfs/xfs_attr.h b/libxfs/xfs_attr.h index 07c61bd70..3ad1f12a5 100644 --- a/libxfs/xfs_attr.h +++ b/libxfs/xfs_attr.h @@ -551,6 +551,7 @@ int xfs_attr_get_ilocked(struct xfs_da_args *args); int xfs_attr_get(struct xfs_da_args *args); int xfs_attr_defer_add(struct xfs_da_args *args); int xfs_attr_defer_remove(struct xfs_da_args *args); +int xfs_attr_defer_replace(struct xfs_da_args *args); int xfs_attr_set(struct xfs_da_args *args); int xfs_attr_set_iter(struct xfs_attr_intent *attr); int xfs_attr_remove_iter(struct xfs_attr_intent *attr); diff --git a/libxfs/xfs_parent.c b/libxfs/xfs_parent.c index b06033243..9f61b9fc6 100644 --- a/libxfs/xfs_parent.c +++ b/libxfs/xfs_parent.c @@ -117,6 +117,19 @@ xfs_init_parent_davalue( args->value = (void *)name->name; } +/* + * Point the da args new value fields at the non-key parts of a replacement + * parent pointer. + */ +static inline void +xfs_init_parent_danewvalue( + struct xfs_da_args *args, + const struct xfs_name *name) +{ + args->new_valuelen = name->len; + args->new_value = (void *)name->name; +} + /* * Allocate memory to control a logged parent pointer update as part of a * dirent operation. @@ -124,22 +137,27 @@ xfs_init_parent_davalue( int __xfs_parent_init( struct xfs_mount *mp, + bool grab_log, struct xfs_parent_defer **parentp) { struct xfs_parent_defer *parent; int error; - error = xfs_attr_grab_log_assist(mp); - if (error) - return error; + if (grab_log) { + error = xfs_attr_grab_log_assist(mp); + if (error) + return error; + } parent = kmem_cache_zalloc(xfs_parent_intent_cache, GFP_KERNEL); if (!parent) { - xfs_attr_rele_log_assist(mp); + if (grab_log) + xfs_attr_rele_log_assist(mp); return -ENOMEM; } /* init parent da_args */ + parent->have_log = grab_log; parent->args.geo = mp->m_attr_geo; parent->args.whichfork = XFS_ATTR_FORK; parent->args.attr_filter = XFS_ATTR_PARENT; @@ -205,13 +223,43 @@ xfs_parent_remove( return xfs_attr_defer_remove(args); } +/* Replace one parent pointer with another to reflect a rename. */ +int +xfs_parent_replace( + struct xfs_trans *tp, + struct xfs_parent_defer *parent, + struct xfs_inode *old_dp, + const struct xfs_name *old_name, + struct xfs_inode *new_dp, + const struct xfs_name *new_name, + struct xfs_inode *child) +{ + struct xfs_da_args *args = &parent->args; + + xfs_init_parent_name_rec(&parent->rec, old_dp, old_name, child); + args->hashval = xfs_parent_hashname(old_dp, parent); + + xfs_init_parent_name_rec(&parent->new_rec, new_dp, new_name, child); + args->new_name = (const uint8_t *)&parent->new_rec; + args->new_namelen = sizeof(struct xfs_parent_name_rec); + + args->trans = tp; + args->dp = child; + + xfs_init_parent_davalue(&parent->args, old_name); + xfs_init_parent_danewvalue(&parent->args, new_name); + + return xfs_attr_defer_replace(args); +} + /* Cancel a parent pointer operation. */ void __xfs_parent_cancel( struct xfs_mount *mp, struct xfs_parent_defer *parent) { - xlog_drop_incompat_feat(mp->m_log); + if (parent->have_log) + xlog_drop_incompat_feat(mp->m_log); kmem_cache_free(xfs_parent_intent_cache, parent); } diff --git a/libxfs/xfs_parent.h b/libxfs/xfs_parent.h index 0f8194cd8..f4a0793bc 100644 --- a/libxfs/xfs_parent.h +++ b/libxfs/xfs_parent.h @@ -21,10 +21,13 @@ extern struct kmem_cache *xfs_parent_intent_cache; */ struct xfs_parent_defer { struct xfs_parent_name_rec rec; + struct xfs_parent_name_rec new_rec; struct xfs_da_args args; + bool have_log; }; -int __xfs_parent_init(struct xfs_mount *mp, struct xfs_parent_defer **parentp); +int __xfs_parent_init(struct xfs_mount *mp, bool grab_log, + struct xfs_parent_defer **parentp); static inline int xfs_parent_start( @@ -34,7 +37,19 @@ xfs_parent_start( *pp = NULL; if (xfs_has_parent(mp)) - return __xfs_parent_init(mp, pp); + return __xfs_parent_init(mp, true, pp); + return 0; +} + +static inline int +xfs_parent_start_locked( + struct xfs_mount *mp, + struct xfs_parent_defer **pp) +{ + *pp = NULL; + + if (xfs_has_parent(mp)) + return __xfs_parent_init(mp, false, pp); return 0; } @@ -44,6 +59,10 @@ int xfs_parent_add(struct xfs_trans *tp, struct xfs_parent_defer *parent, int xfs_parent_remove(struct xfs_trans *tp, struct xfs_parent_defer *parent, struct xfs_inode *dp, const struct xfs_name *parent_name, struct xfs_inode *child); +int xfs_parent_replace(struct xfs_trans *tp, struct xfs_parent_defer *parent, + struct xfs_inode *old_dp, const struct xfs_name *old_name, + struct xfs_inode *new_dp, const struct xfs_name *new_name, + struct xfs_inode *child); void __xfs_parent_cancel(struct xfs_mount *mp, struct xfs_parent_defer *parent); diff --git a/libxfs/xfs_trans_space.h b/libxfs/xfs_trans_space.h index b5ab6701e..810610a14 100644 --- a/libxfs/xfs_trans_space.h +++ b/libxfs/xfs_trans_space.h @@ -91,8 +91,6 @@ XFS_DQUOT_CLUSTER_SIZE_FSB) #define XFS_QM_QINOCREATE_SPACE_RES(mp) \ XFS_IALLOC_SPACE_RES(mp) -#define XFS_RENAME_SPACE_RES(mp,nl) \ - (XFS_DIRREMOVE_SPACE_RES(mp) + XFS_DIRENTER_SPACE_RES(mp,nl)) #define XFS_IFREE_SPACE_RES(mp) \ (xfs_has_finobt(mp) ? M_IGEO(mp)->inobt_maxlevels : 0)