public inbox for linux-xfs@vger.kernel.org
 help / color / mirror / Atom feed
From: Allison Henderson <allison.henderson@oracle.com>
To: linux-xfs@vger.kernel.org
Subject: [PATCH v2 13/18] xfs: add parent attributes to link
Date: Mon, 18 Jul 2022 13:20:17 -0700	[thread overview]
Message-ID: <20220718202022.6598-14-allison.henderson@oracle.com> (raw)
In-Reply-To: <20220718202022.6598-1-allison.henderson@oracle.com>

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

[bfoster: rebase, use VFS inode fields, fix xfs_bmap_finish() usage]
[achender: rebased, changed __unint32_t to xfs_dir2_dataptr_t,
           fixed null pointer bugs]

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Allison Henderson <allison.henderson@oracle.com>
---
 fs/xfs/xfs_inode.c | 43 ++++++++++++++++++++++++++++++++++---------
 1 file changed, 34 insertions(+), 9 deletions(-)

diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index ef993c3a8963..6e5deb0d42c4 100644
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -1228,14 +1228,16 @@ xfs_create_tmpfile(
 
 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);
 
@@ -1252,11 +1254,17 @@ xfs_link(
 	if (error)
 		goto std_return;
 
+	if (xfs_has_parent(mp)) {
+		error = xfs_parent_init(mp, sip, target_name, &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
@@ -1289,14 +1297,26 @@ xfs_link(
 	}
 
 	error = xfs_dir_createname(tp, tdp, target_name, sip->i_ino,
-				   resblks, NULL);
+				   resblks, &diroffset);
 	if (error)
-		goto error_return;
+		goto out_defer_cancel;
 	xfs_trans_ichgtime(tp, tdp, XFS_ICHGTIME_MOD | XFS_ICHGTIME_CHG);
 	xfs_trans_log_inode(tp, tdp, XFS_ILOG_CORE);
 
 	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, tdp, parent, diroffset);
+		if (error)
+			goto out_defer_cancel;
+	}
+
 	/*
 	 * If this is a synchronous mount, make sure that the
 	 * link transaction goes to disk before returning to
@@ -1310,11 +1330,16 @@ xfs_link(
 	xfs_iunlock(sip, XFS_ILOCK_EXCL);
 	return error;
 
- error_return:
+out_defer_cancel:
+	xfs_defer_cancel(tp);
+error_return:
 	xfs_trans_cancel(tp);
 	xfs_iunlock(tdp, XFS_ILOCK_EXCL);
 	xfs_iunlock(sip, XFS_ILOCK_EXCL);
- std_return:
+drop_incompat:
+	if (parent)
+		xfs_parent_cancel(mp, parent);
+std_return:
 	if (error == -ENOSPC && nospace_error)
 		error = nospace_error;
 	return error;
-- 
2.25.1


  parent reply	other threads:[~2022-07-18 20:20 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-07-18 20:20 [PATCH v2 00/18] Parent Pointers Allison Henderson
2022-07-18 20:20 ` [PATCH v2 01/18] xfs: Fix multi-transaction larp replay Allison Henderson
2022-07-18 20:20 ` [PATCH v2 02/18] xfs: Increase XFS_DEFER_OPS_NR_INODES to 5 Allison Henderson
2022-07-18 20:20 ` [PATCH v2 03/18] xfs: Hold inode locks in xfs_ialloc Allison Henderson
2022-07-18 20:20 ` [PATCH v2 04/18] xfs: Hold inode locks in xfs_trans_alloc_dir Allison Henderson
2022-07-18 20:20 ` [PATCH v2 05/18] xfs: get directory offset when adding directory name Allison Henderson
2022-07-18 20:20 ` [PATCH v2 06/18] xfs: get directory offset when removing " Allison Henderson
2022-07-18 20:20 ` [PATCH v2 07/18] xfs: get directory offset when replacing a " Allison Henderson
2022-07-18 20:20 ` [PATCH v2 08/18] xfs: add parent pointer support to attribute code Allison Henderson
2022-07-18 20:20 ` [PATCH v2 09/18] xfs: define parent pointer xattr format Allison Henderson
2022-07-18 20:20 ` [PATCH v2 10/18] xfs: Add xfs_verify_pptr Allison Henderson
2022-07-18 20:20 ` [PATCH v2 11/18] xfs: extend transaction reservations for parent attributes Allison Henderson
2022-07-18 20:20 ` [PATCH v2 12/18] xfs: parent pointer attribute creation Allison Henderson
2022-07-18 20:20 ` Allison Henderson [this message]
2022-07-18 20:20 ` [PATCH v2 14/18] xfs: remove parent pointers in unlink Allison Henderson
2022-07-18 20:20 ` [PATCH v2 15/18] xfs: Add parent pointers to rename Allison Henderson
2022-07-18 20:20 ` [PATCH v2 16/18] xfs: Add the parent pointer support to the superblock version 5 Allison Henderson
2022-07-18 20:20 ` [PATCH v2 17/18] xfs: Add helper function xfs_attr_list_context_init Allison Henderson
2022-07-18 20:20 ` [PATCH v2 18/18] xfs: Add parent pointer ioctl 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=20220718202022.6598-14-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox