All of lore.kernel.org
 help / color / mirror / Atom feed
From: allison.henderson@oracle.com
To: linux-xfs@vger.kernel.org
Subject: [PATCH v8 16/27] xfs: add parent attributes to link
Date: Mon, 23 Jan 2023 18:36:09 -0700	[thread overview]
Message-ID: <20230124013620.1089319-17-allison.henderson@oracle.com> (raw)
In-Reply-To: <20230124013620.1089319-1-allison.henderson@oracle.com>

From: Allison Henderson <allison.henderson@oracle.com>

This patch modifies xfs_link to add a parent pointer to the inode.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Allison Henderson <allison.henderson@oracle.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
---
 fs/xfs/libxfs/xfs_trans_space.h |  2 --
 fs/xfs/xfs_inode.c              | 52 ++++++++++++++++++++++++++++-----
 2 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/fs/xfs/libxfs/xfs_trans_space.h b/fs/xfs/libxfs/xfs_trans_space.h
index 87b31c69a773..f72207923ec2 100644
--- a/fs/xfs/libxfs/xfs_trans_space.h
+++ b/fs/xfs/libxfs/xfs_trans_space.h
@@ -84,8 +84,6 @@
 	(2 * (mp)->m_alloc_maxlevels)
 #define	XFS_GROWFSRT_SPACE_RES(mp,b)	\
 	((b) + XFS_EXTENTADD_SPACE_RES(mp, XFS_DATA_FORK))
-#define	XFS_LINK_SPACE_RES(mp,nl)	\
-	XFS_DIRENTER_SPACE_RES(mp,nl)
 #define	XFS_MKDIR_SPACE_RES(mp,nl)	\
 	(XFS_IALLOC_SPACE_RES(mp) + XFS_DIRENTER_SPACE_RES(mp,nl))
 #define	XFS_QM_DQALLOC_SPACE_RES(mp)	\
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index 9e195d0e6abc..ccc61cf0f9c6 100644
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -1249,16 +1249,32 @@ xfs_create_tmpfile(
 	return error;
 }
 
+static unsigned int
+xfs_link_space_res(
+	struct xfs_mount	*mp,
+	unsigned int		namelen)
+{
+	unsigned int		ret;
+
+	ret = XFS_DIRENTER_SPACE_RES(mp, namelen);
+	if (xfs_has_parent(mp))
+		ret += xfs_pptr_calc_space_res(mp, namelen);
+
+	return ret;
+}
+
 int
 xfs_link(
-	xfs_inode_t		*tdp,
-	xfs_inode_t		*sip,
+	struct xfs_inode	*tdp,
+	struct xfs_inode	*sip,
 	struct xfs_name		*target_name)
 {
-	xfs_mount_t		*mp = tdp->i_mount;
-	xfs_trans_t		*tp;
+	struct xfs_mount	*mp = tdp->i_mount;
+	struct xfs_trans	*tp;
 	int			error, nospace_error = 0;
 	int			resblks;
+	xfs_dir2_dataptr_t	diroffset;
+	struct xfs_parent_defer	*parent = NULL;
 
 	trace_xfs_link(tdp, target_name);
 
@@ -1275,11 +1291,17 @@ xfs_link(
 	if (error)
 		goto std_return;
 
-	resblks = XFS_LINK_SPACE_RES(mp, target_name->len);
+	if (xfs_has_parent(mp)) {
+		error = xfs_parent_init(mp, &parent);
+		if (error)
+			goto std_return;
+	}
+
+	resblks = xfs_link_space_res(mp, target_name->len);
 	error = xfs_trans_alloc_dir(tdp, &M_RES(mp)->tr_link, sip, &resblks,
 			&tp, &nospace_error);
 	if (error)
-		goto std_return;
+		goto drop_incompat;
 
 	/*
 	 * If we are using project inheritance, we only allow hard link
@@ -1312,7 +1334,7 @@ xfs_link(
 	}
 
 	error = xfs_dir_createname(tp, tdp, target_name, sip->i_ino,
-				   resblks, NULL);
+				   resblks, &diroffset);
 	if (error)
 		goto error_return;
 	xfs_trans_ichgtime(tp, tdp, XFS_ICHGTIME_MOD | XFS_ICHGTIME_CHG);
@@ -1320,6 +1342,19 @@ xfs_link(
 
 	xfs_bumplink(tp, sip);
 
+	/*
+	 * If we have parent pointers, we now need to add the parent record to
+	 * the attribute fork of the inode. If this is the initial parent
+	 * attribute, we need to create it correctly, otherwise we can just add
+	 * the parent to the inode.
+	 */
+	if (parent) {
+		error = xfs_parent_defer_add(tp, parent, tdp, target_name,
+					     diroffset, sip);
+		if (error)
+			goto error_return;
+	}
+
 	/*
 	 * If this is a synchronous mount, make sure that the
 	 * link transaction goes to disk before returning to
@@ -1337,6 +1372,9 @@ xfs_link(
 	xfs_trans_cancel(tp);
 	xfs_iunlock(tdp, XFS_ILOCK_EXCL);
 	xfs_iunlock(sip, XFS_ILOCK_EXCL);
+ drop_incompat:
+	if (parent)
+		xfs_parent_cancel(mp, parent);
  std_return:
 	if (error == -ENOSPC && nospace_error)
 		error = nospace_error;
-- 
2.25.1


  parent reply	other threads:[~2023-01-24  1:36 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-24  1:35 [PATCH v8 00/27] Parent Pointers allison.henderson
2023-01-24  1:35 ` [PATCH v8 01/27] xfs: Add new name to attri/d allison.henderson
2023-01-24  1:35 ` [PATCH v8 02/27] xfs: Increase XFS_DEFER_OPS_NR_INODES to 5 allison.henderson
2023-01-24  1:35 ` [PATCH v8 03/27] xfs: Increase XFS_QM_TRANS_MAXDQS " allison.henderson
2023-01-24  1:35 ` [PATCH v8 04/27] xfs: Hold inode locks in xfs_ialloc allison.henderson
2023-01-24  1:35 ` [PATCH v8 05/27] xfs: Hold inode locks in xfs_trans_alloc_dir allison.henderson
2023-01-24  1:35 ` [PATCH v8 06/27] xfs: Hold inode locks in xfs_rename allison.henderson
2023-01-24  1:36 ` [PATCH v8 07/27] xfs: Expose init_xattrs in xfs_create_tmpfile allison.henderson
2023-01-24  1:36 ` [PATCH v8 08/27] xfs: get directory offset when adding directory name allison.henderson
2023-01-24  1:36 ` [PATCH v8 09/27] xfs: get directory offset when removing " allison.henderson
2023-01-24  1:36 ` [PATCH v8 10/27] xfs: get directory offset when replacing a " allison.henderson
2023-01-24  1:36 ` [PATCH v8 11/27] xfs: add parent pointer support to attribute code allison.henderson
2023-01-24  1:36 ` [PATCH v8 12/27] xfs: define parent pointer xattr format allison.henderson
2023-01-24  1:36 ` [PATCH v8 13/27] xfs: Add xfs_verify_pptr allison.henderson
2023-01-24  1:36 ` [PATCH v8 14/27] xfs: extend transaction reservations for parent attributes allison.henderson
2023-01-24  1:36 ` [PATCH v8 15/27] xfs: parent pointer attribute creation allison.henderson
2023-01-24  1:36 ` allison.henderson [this message]
2023-01-24  1:36 ` [PATCH v8 17/27] xfs: add parent attributes to symlink allison.henderson
2023-01-24  1:36 ` [PATCH v8 18/27] xfs: remove parent pointers in unlink allison.henderson
2023-01-24  1:36 ` [PATCH v8 19/27] xfs: Indent xfs_rename allison.henderson
2023-01-24  1:36 ` [PATCH v8 20/27] xfs: Add parent pointers to rename allison.henderson
2023-01-24  1:36 ` [PATCH v8 21/27] xfs: Add parent pointers to xfs_cross_rename allison.henderson
2023-01-24  1:36 ` [PATCH v8 22/27] xfs: Add the parent pointer support to the superblock version 5 allison.henderson
2023-01-24  1:36 ` [PATCH v8 23/27] xfs: Add helper function xfs_attr_list_context_init allison.henderson
2023-01-24  1:36 ` [PATCH v8 24/27] xfs: Filter XFS_ATTR_PARENT for getfattr allison.henderson
2023-01-24  1:36 ` [PATCH v8 25/27] xfs: Add parent pointer ioctl allison.henderson
2023-01-24  1:36 ` [PATCH v8 26/27] xfs: fix unit conversion error in xfs_log_calc_max_attrsetm_res allison.henderson
2023-01-24  1:36 ` [PATCH v8 27/27] xfs: drop compatibility minimum log size computations for reflink allison.henderson
2023-01-24  4:38 ` [PATCH v8 00/27] Parent Pointers Darrick J. Wong
2023-01-24  7:38   ` Allison Henderson
2023-01-25  1:15     ` Darrick J. Wong
2023-01-25 17:10       ` Darrick J. Wong
2023-01-25 20:54         ` Allison Henderson
2023-02-01  1:12           ` Darrick J. Wong

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=20230124013620.1089319-17-allison.henderson@oracle.com \
    --to=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.