From: "Darrick J. Wong" <djwong@kernel.org>
To: allison.henderson@oracle.com
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH v4 19/27] xfs: Add parent pointers to xfs_cross_rename
Date: Tue, 25 Oct 2022 14:32:21 -0700 [thread overview]
Message-ID: <Y1hV5WzaeYR742RX@magnolia> (raw)
In-Reply-To: <20221021222936.934426-20-allison.henderson@oracle.com>
On Fri, Oct 21, 2022 at 03:29:28PM -0700, allison.henderson@oracle.com wrote:
> From: Allison Henderson <allison.henderson@oracle.com>
>
> Cross renames are handled separately from standard renames, and
> need different handling to update the parent attributes correctly.
>
> Signed-off-by: Allison Henderson <allison.henderson@oracle.com>
> ---
> fs/xfs/xfs_inode.c | 79 ++++++++++++++++++++++++++++++++++++----------
> 1 file changed, 63 insertions(+), 16 deletions(-)
>
> diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
> index 83cc52c2bcf1..c79d1047d118 100644
> --- a/fs/xfs/xfs_inode.c
> +++ b/fs/xfs/xfs_inode.c
> @@ -2746,27 +2746,49 @@ xfs_finish_rename(
> */
> STATIC int
> xfs_cross_rename(
> - struct xfs_trans *tp,
> - struct xfs_inode *dp1,
> - struct xfs_name *name1,
> - struct xfs_inode *ip1,
> - struct xfs_inode *dp2,
> - struct xfs_name *name2,
> - struct xfs_inode *ip2,
> - int spaceres)
> -{
> - int error = 0;
> - int ip1_flags = 0;
> - int ip2_flags = 0;
> - int dp2_flags = 0;
> + struct xfs_trans *tp,
> + struct xfs_inode *dp1,
> + struct xfs_name *name1,
> + struct xfs_inode *ip1,
> + struct xfs_inode *dp2,
> + struct xfs_name *name2,
> + struct xfs_inode *ip2,
> + int spaceres)
> +{
> + struct xfs_mount *mp = dp1->i_mount;
> + int error = 0;
> + int ip1_flags = 0;
> + int ip2_flags = 0;
> + int dp2_flags = 0;
> + int new_diroffset, old_diroffset;
> + struct xfs_parent_defer *old_parent_ptr = NULL;
> + struct xfs_parent_defer *new_parent_ptr = NULL;
> + struct xfs_parent_defer *old_parent_ptr2 = NULL;
> + struct xfs_parent_defer *new_parent_ptr2 = NULL;
> +
> +
Nit: extra blank line
> + if (xfs_has_parent(mp)) {
> + error = xfs_parent_init(mp, &old_parent_ptr);
> + if (error)
> + goto out_trans_abort;
> + error = xfs_parent_init(mp, &new_parent_ptr);
> + if (error)
> + goto out_trans_abort;
> + error = xfs_parent_init(mp, &old_parent_ptr2);
> + if (error)
> + goto out_trans_abort;
> + error = xfs_parent_init(mp, &new_parent_ptr2);
> + if (error)
> + goto out_trans_abort;
> + }
>
> /* Swap inode number for dirent in first parent */
> - error = xfs_dir_replace(tp, dp1, name1, ip2->i_ino, spaceres, NULL);
> + error = xfs_dir_replace(tp, dp1, name1, ip2->i_ino, spaceres, &old_diroffset);
> if (error)
> goto out_trans_abort;
>
> /* Swap inode number for dirent in second parent */
> - error = xfs_dir_replace(tp, dp2, name2, ip1->i_ino, spaceres, NULL);
> + error = xfs_dir_replace(tp, dp2, name2, ip1->i_ino, spaceres, &new_diroffset);
> if (error)
> goto out_trans_abort;
>
> @@ -2827,6 +2849,20 @@ xfs_cross_rename(
> }
> }
>
> + if (xfs_has_parent(mp)) {
> + error = xfs_parent_defer_replace(tp, dp1,
Isn't xfs_parent_defer_replace() added in the next patch?
> + old_parent_ptr, old_diroffset, name2, dp2,
> + new_parent_ptr, new_diroffset, ip1);
The changes to xfs_parent_defer_replace that I mention in the next patch
notwithstanding, this looks good now.
--D
> + if (error)
> + goto out_trans_abort;
> +
> + error = xfs_parent_defer_replace(tp, dp2, new_parent_ptr2,
> + new_diroffset, name1, dp1, old_parent_ptr2,
> + old_diroffset, ip2);
> + if (error)
> + goto out_trans_abort;
> + }
> +
> if (ip1_flags) {
> xfs_trans_ichgtime(tp, ip1, ip1_flags);
> xfs_trans_log_inode(tp, ip1, XFS_ILOG_CORE);
> @@ -2841,10 +2877,21 @@ xfs_cross_rename(
> }
> xfs_trans_ichgtime(tp, dp1, XFS_ICHGTIME_MOD | XFS_ICHGTIME_CHG);
> xfs_trans_log_inode(tp, dp1, XFS_ILOG_CORE);
> - return xfs_finish_rename(tp);
>
> + error = xfs_finish_rename(tp);
> + goto out;
> out_trans_abort:
> xfs_trans_cancel(tp);
> +out:
> + if (new_parent_ptr)
> + xfs_parent_cancel(mp, new_parent_ptr);
> + if (old_parent_ptr)
> + xfs_parent_cancel(mp, old_parent_ptr);
> + if (new_parent_ptr2)
> + xfs_parent_cancel(mp, new_parent_ptr2);
> + if (old_parent_ptr2)
> + xfs_parent_cancel(mp, old_parent_ptr2);
> +
> return error;
> }
>
> --
> 2.25.1
>
next prev parent reply other threads:[~2022-10-25 21:32 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-21 22:29 [PATCH v4 00/27] Parent Pointers allison.henderson
2022-10-21 22:29 ` [PATCH v4 01/27] xfs: Add new name to attri/d allison.henderson
2022-10-25 19:09 ` Darrick J. Wong
2022-10-26 7:40 ` Allison Henderson
2022-10-21 22:29 ` [PATCH v4 02/27] xfs: Increase XFS_DEFER_OPS_NR_INODES to 5 allison.henderson
2022-10-28 1:52 ` Catherine Hoang
2022-10-21 22:29 ` [PATCH v4 03/27] xfs: Hold inode locks in xfs_ialloc allison.henderson
2022-10-28 1:54 ` Catherine Hoang
2022-10-21 22:29 ` [PATCH v4 04/27] xfs: Hold inode locks in xfs_trans_alloc_dir allison.henderson
2022-10-28 1:56 ` Catherine Hoang
2022-10-21 22:29 ` [PATCH v4 05/27] xfs: Hold inode locks in xfs_rename allison.henderson
2022-10-28 1:59 ` Catherine Hoang
2022-10-21 22:29 ` [PATCH v4 06/27] xfs: Expose init_xattrs in xfs_create_tmpfile allison.henderson
2022-10-25 19:13 ` Darrick J. Wong
2022-10-25 21:33 ` Darrick J. Wong
2022-10-26 7:40 ` Allison Henderson
2022-10-21 22:29 ` [PATCH v4 07/27] xfs: get directory offset when adding directory name allison.henderson
2022-10-28 2:02 ` Catherine Hoang
2022-10-21 22:29 ` [PATCH v4 08/27] xfs: get directory offset when removing " allison.henderson
2022-10-28 2:06 ` Catherine Hoang
2022-10-21 22:29 ` [PATCH v4 09/27] xfs: get directory offset when replacing a " allison.henderson
2022-10-21 22:29 ` [PATCH v4 10/27] xfs: add parent pointer support to attribute code allison.henderson
2022-10-21 22:29 ` [PATCH v4 11/27] xfs: define parent pointer xattr format allison.henderson
2022-10-21 22:29 ` [PATCH v4 12/27] xfs: Add xfs_verify_pptr allison.henderson
2022-10-21 22:29 ` [PATCH v4 13/27] xfs: Increase rename inode reservation allison.henderson
2022-10-25 19:15 ` Darrick J. Wong
2022-10-26 7:40 ` Allison Henderson
2022-10-21 22:29 ` [PATCH v4 14/27] xfs: extend transaction reservations for parent attributes allison.henderson
2022-10-25 20:55 ` Darrick J. Wong
2022-10-26 7:40 ` Allison Henderson
2022-10-21 22:29 ` [PATCH v4 15/27] xfs: parent pointer attribute creation allison.henderson
2022-10-25 21:11 ` Darrick J. Wong
2022-10-26 7:40 ` Allison Henderson
2022-10-21 22:29 ` [PATCH v4 16/27] xfs: add parent attributes to link allison.henderson
2022-10-25 20:58 ` Darrick J. Wong
2022-10-21 22:29 ` [PATCH v4 17/27] xfs: add parent attributes to symlink allison.henderson
2022-10-25 21:06 ` Darrick J. Wong
2022-10-21 22:29 ` [PATCH v4 18/27] xfs: remove parent pointers in unlink allison.henderson
2022-10-25 21:14 ` Darrick J. Wong
2022-10-26 7:40 ` Allison Henderson
2022-10-21 22:29 ` [PATCH v4 19/27] xfs: Add parent pointers to xfs_cross_rename allison.henderson
2022-10-25 21:32 ` Darrick J. Wong [this message]
2022-10-26 7:40 ` Allison Henderson
2022-10-21 22:29 ` [PATCH v4 20/27] xfs: Indent xfs_rename allison.henderson
2022-10-21 22:29 ` [PATCH v4 21/27] xfs: Add parent pointers to rename allison.henderson
2022-10-25 21:28 ` Darrick J. Wong
2022-10-26 7:40 ` Allison Henderson
2022-10-21 22:29 ` [PATCH v4 22/27] xfs: Add the parent pointer support to the superblock version 5 allison.henderson
2022-10-21 22:29 ` [PATCH v4 23/27] xfs: Add helper function xfs_attr_list_context_init allison.henderson
2022-10-21 22:29 ` [PATCH v4 24/27] xfs: Filter XFS_ATTR_PARENT for getfattr allison.henderson
2022-10-25 21:34 ` Darrick J. Wong
2022-10-26 7:40 ` Allison Henderson
2022-10-21 22:29 ` [PATCH v4 25/27] xfs: Add parent pointer ioctl allison.henderson
2022-10-21 22:29 ` [PATCH v4 26/27] xfs: fix unit conversion error in xfs_log_calc_max_attrsetm_res allison.henderson
2022-10-21 22:29 ` [PATCH v4 27/27] xfs: drop compatibility minimum log size computations for reflink 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=Y1hV5WzaeYR742RX@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox