From: "Darrick J. Wong" <djwong@kernel.org>
To: allison.henderson@oracle.com
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH v3 20/26] xfs: Add parent pointers to rename
Date: Fri, 23 Sep 2022 15:08:44 -0700 [thread overview]
Message-ID: <Yy4ubKiwEpzpwUJZ@magnolia> (raw)
In-Reply-To: <20220922054458.40826-21-allison.henderson@oracle.com>
On Wed, Sep 21, 2022 at 10:44:52PM -0700, allison.henderson@oracle.com wrote:
> From: Allison Henderson <allison.henderson@oracle.com>
>
> This patch removes the old parent pointer attribute during the rename
> operation, and re-adds the updated parent pointer. In the case of
> xfs_cross_rename, we modify the routine not to roll the transaction just
> yet. We will do this after the parent pointer is added in the calling
> xfs_rename function.
>
> Signed-off-by: Allison Henderson <allison.henderson@oracle.com>
> ---
> fs/xfs/libxfs/xfs_attr.c | 2 +-
> fs/xfs/libxfs/xfs_attr.h | 1 +
> fs/xfs/libxfs/xfs_parent.c | 31 +++++++++++++++++
> fs/xfs/libxfs/xfs_parent.h | 7 ++++
> fs/xfs/xfs_inode.c | 69 +++++++++++++++++++++++++++++++++++---
> 5 files changed, 104 insertions(+), 6 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
> index e967728d1ee7..3f9bd8401f33 100644
> --- a/fs/xfs/libxfs/xfs_attr.c
> +++ b/fs/xfs/libxfs/xfs_attr.c
> @@ -923,7 +923,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/fs/xfs/libxfs/xfs_attr.h b/fs/xfs/libxfs/xfs_attr.h
> index 033005542b9e..985761264d1f 100644
> --- a/fs/xfs/libxfs/xfs_attr.h
> +++ b/fs/xfs/libxfs/xfs_attr.h
> @@ -546,6 +546,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/fs/xfs/libxfs/xfs_parent.c b/fs/xfs/libxfs/xfs_parent.c
> index 378fa227b87f..7db1570e1841 100644
> --- a/fs/xfs/libxfs/xfs_parent.c
> +++ b/fs/xfs/libxfs/xfs_parent.c
> @@ -141,6 +141,37 @@ xfs_parent_defer_remove(
> return xfs_attr_defer_remove(args);
> }
>
> +
> +int
> +xfs_parent_defer_replace(
> + struct xfs_trans *tp,
> + struct xfs_inode *old_ip,
> + struct xfs_parent_defer *old_parent,
> + xfs_dir2_dataptr_t old_diroffset,
> + struct xfs_name *parent_name,
> + struct xfs_inode *new_ip,
> + struct xfs_parent_defer *new_parent,
> + xfs_dir2_dataptr_t new_diroffset,
> + struct xfs_inode *child)
> +{
> + struct xfs_da_args *args = &new_parent->args;
> +
> + xfs_init_parent_name_rec(&old_parent->rec, old_ip, old_diroffset);
> + xfs_init_parent_name_rec(&new_parent->rec, new_ip, new_diroffset);
> + new_parent->args.name = (const uint8_t *)&old_parent->rec;
> + new_parent->args.namelen = sizeof(struct xfs_parent_name_rec);
> + new_parent->args.new_name = (const uint8_t *)&new_parent->rec;
> + new_parent->args.new_namelen = sizeof(struct xfs_parent_name_rec);
> + args->trans = tp;
> + args->dp = child;
> + if (parent_name) {
> + new_parent->args.value = (void *)parent_name->name;
> + new_parent->args.valuelen = parent_name->len;
> + }
> + args->hashval = xfs_da_hashname(args->name, args->namelen);
> + return xfs_attr_defer_replace(args);
> +}
> +
> void
> xfs_parent_cancel(
> xfs_mount_t *mp,
> diff --git a/fs/xfs/libxfs/xfs_parent.h b/fs/xfs/libxfs/xfs_parent.h
> index 79d3fabb5e56..b2ed4f373799 100644
> --- a/fs/xfs/libxfs/xfs_parent.h
> +++ b/fs/xfs/libxfs/xfs_parent.h
> @@ -27,6 +27,13 @@ int xfs_parent_init(xfs_mount_t *mp, struct xfs_parent_defer **parentp);
> int xfs_parent_defer_add(struct xfs_trans *tp, struct xfs_parent_defer *parent,
> struct xfs_inode *dp, struct xfs_name *parent_name,
> xfs_dir2_dataptr_t diroffset, struct xfs_inode *child);
> +int xfs_parent_defer_replace(struct xfs_trans *tp, struct xfs_inode *old_ip,
> + struct xfs_parent_defer *old_parent,
> + xfs_dir2_dataptr_t old_diroffset,
> + struct xfs_name *parent_name, struct xfs_inode *new_ip,
> + struct xfs_parent_defer *new_parent,
> + xfs_dir2_dataptr_t new_diroffset,
> + struct xfs_inode *child);
> int xfs_parent_defer_remove(struct xfs_trans *tp, struct xfs_inode *dp,
> struct xfs_parent_defer *parent,
> xfs_dir2_dataptr_t diroffset,
> diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
> index 4a8399d35b17..3a2bec4ba228 100644
> --- a/fs/xfs/xfs_inode.c
> +++ b/fs/xfs/xfs_inode.c
> @@ -2912,6 +2912,12 @@ xfs_rename(
> int spaceres;
> bool retried = false;
> int error, nospace_error = 0;
> + xfs_dir2_dataptr_t new_diroffset;
> + xfs_dir2_dataptr_t old_diroffset;
> + struct xfs_parent_defer *old_parent_ptr = NULL;
> + struct xfs_parent_defer *new_parent_ptr = NULL;
> + struct xfs_parent_defer *target_parent_ptr = NULL;
> + struct xfs_parent_defer *wip_parent_ptr = NULL;
>
> trace_xfs_rename(src_dp, target_dp, src_name, target_name);
>
> @@ -2925,7 +2931,8 @@ xfs_rename(
> */
> if (flags & RENAME_WHITEOUT) {
> error = xfs_rename_alloc_whiteout(mnt_userns, src_name,
> - target_dp, false, &wip);
> + target_dp, xfs_has_parent(mp),
> + &wip);
> if (error)
> return error;
>
> @@ -2935,6 +2942,24 @@ xfs_rename(
>
> xfs_sort_for_rename(src_dp, target_dp, src_ip, target_ip, wip,
> inodes, &num_inodes);
> + if (xfs_has_parent(mp)) {
> + error = xfs_parent_init(mp, &old_parent_ptr);
> + if (error)
> + goto out_release_wip;
> + error = xfs_parent_init(mp, &new_parent_ptr);
> + if (error)
> + goto out_release_wip;
> + if (wip) {
> + error = xfs_parent_init(mp, &wip_parent_ptr);
> + if (error)
> + goto out_release_wip;
> + }
> + if (target_ip != NULL) {
> + error = xfs_parent_init(mp, &target_parent_ptr);
> + if (error)
> + goto out_release_wip;
> + }
> + }
>
> retry:
> nospace_error = 0;
Same block reservation comment as most of the previous ones, except this
one is super nasty:
unsigned int
xfs_rename_space_res(
struct xfs_mount *mp,
struct xfs_name *src_name,
struct xfs_parent_defer *target_parent_ptr,
struct xfs_name *target_name,
struct xfs_parent_defer *new_parent_ptr,
struct xfs_inode *wip)
{
unsigned int ret;
/* XXX is the target_name->len usage below correct? */
ret = XFS_DIRREMOVE_SPACE_RES(mp) +
XFS_DIRENTER_SPACE_RES(mp, target_name->len);
if (new_parent_ptr) {
if (wip)
ret += xfs_pptr_calc_space_res(mp, src_name->len);
ret += 2 * xfs_pptr_calc_space_res(mp, target_name->len);
}
if (target_parent_ptr)
ret += xfs_pptr_calc_space_res(mp, target_name->len);
return ret;
}
xfs_rename(...)
{
spacres = xfs_rename_space_res(mp, src_name, target_parent_ptr,
target_name, new_parent_ptr, wip);
error = xfs_trans_alloc(mp, &M_RES(mp)->tr_rename, spaceres, 0,
0, &tp);
/* ... */
}
(The rest of the logic looks ok now.)
--D
> @@ -3110,7 +3135,7 @@ xfs_rename(
> * to account for the ".." reference from the new entry.
> */
> error = xfs_dir_createname(tp, target_dp, target_name,
> - src_ip->i_ino, spaceres, NULL);
> + src_ip->i_ino, spaceres, &new_diroffset);
> if (error)
> goto out_trans_cancel;
>
> @@ -3131,7 +3156,7 @@ xfs_rename(
> * name at the destination directory, remove it first.
> */
> error = xfs_dir_replace(tp, target_dp, target_name,
> - src_ip->i_ino, spaceres, NULL);
> + src_ip->i_ino, spaceres, &new_diroffset);
> if (error)
> goto out_trans_cancel;
>
> @@ -3204,14 +3229,39 @@ xfs_rename(
> */
> if (wip)
> error = xfs_dir_replace(tp, src_dp, src_name, wip->i_ino,
> - spaceres, NULL);
> + spaceres, &old_diroffset);
> else
> error = xfs_dir_removename(tp, src_dp, src_name, src_ip->i_ino,
> - spaceres, NULL);
> + spaceres, &old_diroffset);
>
> if (error)
> goto out_trans_cancel;
>
> + if (new_parent_ptr) {
> + if (wip) {
> + error = xfs_parent_defer_add(tp, wip_parent_ptr,
> + src_dp, src_name,
> + old_diroffset, wip);
> + if (error)
> + goto out_trans_cancel;
> + }
> +
> + error = xfs_parent_defer_replace(tp, src_dp, old_parent_ptr,
> + old_diroffset, target_name,
> + target_dp, new_parent_ptr,
> + new_diroffset, src_ip);
> + if (error)
> + goto out_trans_cancel;
> + }
> +
> + if (target_parent_ptr) {
> + error = xfs_parent_defer_remove(tp, target_dp,
> + target_parent_ptr,
> + new_diroffset, target_ip);
> + if (error)
> + goto out_trans_cancel;
> + }
> +
> xfs_trans_ichgtime(tp, src_dp, XFS_ICHGTIME_MOD | XFS_ICHGTIME_CHG);
> xfs_trans_log_inode(tp, src_dp, XFS_ILOG_CORE);
> if (new_parent)
> @@ -3234,6 +3284,15 @@ xfs_rename(
> i--;
> }
> out_release_wip:
> + if (new_parent_ptr)
> + xfs_parent_cancel(mp, new_parent_ptr);
> + if (old_parent_ptr)
> + xfs_parent_cancel(mp, old_parent_ptr);
> + if (target_parent_ptr)
> + xfs_parent_cancel(mp, target_parent_ptr);
> + if (wip_parent_ptr)
> + xfs_parent_cancel(mp, wip_parent_ptr);
> +
> if (wip)
> xfs_irele(wip);
> if (error == -ENOSPC && nospace_error)
> --
> 2.25.1
>
next prev parent reply other threads:[~2022-09-23 22:08 UTC|newest]
Thread overview: 76+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-22 5:44 [PATCH v3 00/26] Parent Pointers allison.henderson
2022-09-22 5:44 ` [PATCH v3 01/26] xfs: Add new name to attri/d allison.henderson
2022-09-23 18:53 ` Darrick J. Wong
2022-09-23 20:43 ` Allison Henderson
2022-09-22 5:44 ` [PATCH v3 02/26] xfs: Increase XFS_DEFER_OPS_NR_INODES to 5 allison.henderson
2022-09-23 19:02 ` Darrick J. Wong
2022-09-23 20:45 ` Allison Henderson
2022-09-22 5:44 ` [PATCH v3 03/26] xfs: Hold inode locks in xfs_ialloc allison.henderson
2022-09-22 5:44 ` [PATCH v3 04/26] xfs: Hold inode locks in xfs_trans_alloc_dir allison.henderson
2022-09-23 19:04 ` Darrick J. Wong
2022-09-23 20:44 ` Allison Henderson
2022-09-22 5:44 ` [PATCH v3 05/26] xfs: Hold inode locks in xfs_rename allison.henderson
2022-09-23 19:21 ` Darrick J. Wong
2022-09-23 20:44 ` Allison Henderson
2022-09-22 5:44 ` [PATCH v3 06/26] xfs: Expose init_xattrs in xfs_create_tmpfile allison.henderson
2022-09-23 19:25 ` Darrick J. Wong
2022-09-23 20:45 ` Allison Henderson
2022-09-23 21:18 ` Darrick J. Wong
2022-09-22 5:44 ` [PATCH v3 07/26] xfs: get directory offset when adding directory name allison.henderson
2022-09-22 5:44 ` [PATCH v3 08/26] xfs: get directory offset when removing " allison.henderson
2022-09-22 5:44 ` [PATCH v3 09/26] xfs: get directory offset when replacing a " allison.henderson
2022-09-22 5:44 ` [PATCH v3 10/26] xfs: add parent pointer support to attribute code allison.henderson
2022-09-22 5:44 ` [PATCH v3 11/26] xfs: define parent pointer xattr format allison.henderson
2022-09-22 5:44 ` [PATCH v3 12/26] xfs: Add xfs_verify_pptr allison.henderson
2022-09-22 5:44 ` [PATCH v3 13/26] xfs: extend transaction reservations for parent attributes allison.henderson
2022-09-23 20:17 ` Darrick J. Wong
2022-09-23 23:53 ` Allison Henderson
2022-09-26 23:53 ` Darrick J. Wong
2022-09-27 20:04 ` Allison Henderson
2022-09-27 20:44 ` Darrick J. Wong
2022-09-22 5:44 ` [PATCH v3 14/26] xfs: parent pointer attribute creation allison.henderson
2022-09-23 21:11 ` Darrick J. Wong
2022-09-26 21:48 ` Allison Henderson
2022-09-26 23:54 ` Darrick J. Wong
2022-09-27 20:10 ` Allison Henderson
2022-09-22 5:44 ` [PATCH v3 15/26] xfs: add parent attributes to link allison.henderson
2022-09-23 20:31 ` Darrick J. Wong
2022-09-26 21:49 ` Allison Henderson
2022-09-26 23:55 ` Darrick J. Wong
2022-09-22 5:44 ` [PATCH v3 16/26] xfs: add parent attributes to symlink allison.henderson
2022-09-23 21:16 ` Darrick J. Wong
2022-09-26 21:48 ` Allison Henderson
2022-09-22 5:44 ` [PATCH v3 17/26] xfs: remove parent pointers in unlink allison.henderson
2022-09-23 21:22 ` Darrick J. Wong
2022-09-26 21:49 ` Allison Henderson
2022-09-22 5:44 ` [PATCH v3 18/26] xfs: Add parent pointers to xfs_cross_rename allison.henderson
2022-09-23 21:52 ` Darrick J. Wong
2022-09-26 21:50 ` Allison Henderson
2022-09-22 5:44 ` [PATCH v3 19/26] xfs: Indent xfs_rename allison.henderson
2022-09-23 21:22 ` Darrick J. Wong
2022-09-26 21:49 ` Allison Henderson
2022-09-22 5:44 ` [PATCH v3 20/26] xfs: Add parent pointers to rename allison.henderson
2022-09-23 22:08 ` Darrick J. Wong [this message]
2022-09-26 21:50 ` Allison Henderson
2022-09-22 5:44 ` [PATCH v3 21/26] xfs: Add the parent pointer support to the superblock version 5 allison.henderson
2022-09-22 5:44 ` [PATCH v3 22/26] xfs: Add helper function xfs_attr_list_context_init allison.henderson
2022-09-22 5:44 ` [PATCH v3 23/26] xfs: Filter XFS_ATTR_PARENT for getfattr allison.henderson
2022-09-22 16:55 ` Allison Henderson
2022-09-23 21:45 ` Darrick J. Wong
2022-09-26 21:49 ` Allison Henderson
2022-09-27 18:32 ` Darrick J. Wong
2022-09-28 18:22 ` Allison Henderson
2022-09-28 1:13 ` [xfs] b73248c4ee: xfstests.xfs.269.fail kernel test robot
2022-09-28 1:13 ` kernel test robot
2022-09-22 5:44 ` [PATCH v3 24/26] xfs: Add parent pointer ioctl allison.henderson
2022-09-22 14:02 ` kernel test robot
2022-09-24 0:30 ` Darrick J. Wong
2022-09-26 21:50 ` Allison Henderson
2022-09-27 18:34 ` Darrick J. Wong
2022-09-22 5:44 ` [PATCH v3 25/26] xfs: fix unit conversion error in xfs_log_calc_max_attrsetm_res allison.henderson
2022-09-23 21:47 ` Darrick J. Wong
2022-09-26 21:50 ` Allison Henderson
2022-09-27 0:02 ` Darrick J. Wong
2022-09-22 5:44 ` [PATCH v3 26/26] xfs: drop compatibility minimum log size computations for reflink allison.henderson
2022-09-23 21:48 ` Darrick J. Wong
2022-09-26 21:50 ` Allison Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Yy4ubKiwEpzpwUJZ@magnolia \
--to=djwong@kernel.org \
--cc=allison.henderson@oracle.com \
--cc=linux-xfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.