All of lore.kernel.org
 help / color / mirror / Atom feed
From: allison.henderson@oracle.com
To: linux-xfs@vger.kernel.org
Subject: [PATCH v8 09/27] xfs: get directory offset when removing directory name
Date: Mon, 23 Jan 2023 18:36:02 -0700	[thread overview]
Message-ID: <20230124013620.1089319-10-allison.henderson@oracle.com> (raw)
In-Reply-To: <20230124013620.1089319-1-allison.henderson@oracle.com>

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

Return the directory offset information when removing an entry to the
directory.

This offset will be used as the parent pointer offset in xfs_remove.

Signed-off-by: Mark Tinguely <tinguely@sgi.com>
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>
Reviewed-by: Catherine Hoang <catherine.hoang@oracle.com>
---
 fs/xfs/libxfs/xfs_dir2.c       | 6 +++++-
 fs/xfs/libxfs/xfs_dir2.h       | 3 ++-
 fs/xfs/libxfs/xfs_dir2_block.c | 4 ++--
 fs/xfs/libxfs/xfs_dir2_leaf.c  | 5 +++--
 fs/xfs/libxfs/xfs_dir2_node.c  | 5 +++--
 fs/xfs/libxfs/xfs_dir2_sf.c    | 2 ++
 fs/xfs/xfs_inode.c             | 4 ++--
 7 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/fs/xfs/libxfs/xfs_dir2.c b/fs/xfs/libxfs/xfs_dir2.c
index 69a6561c22cc..891c1f701f53 100644
--- a/fs/xfs/libxfs/xfs_dir2.c
+++ b/fs/xfs/libxfs/xfs_dir2.c
@@ -436,7 +436,8 @@ xfs_dir_removename(
 	struct xfs_inode	*dp,
 	struct xfs_name		*name,
 	xfs_ino_t		ino,
-	xfs_extlen_t		total)		/* bmap's total block count */
+	xfs_extlen_t		total,		/* bmap's total block count */
+	xfs_dir2_dataptr_t	*offset)	/* OUT: offset in directory */
 {
 	struct xfs_da_args	*args;
 	int			rval;
@@ -481,6 +482,9 @@ xfs_dir_removename(
 	else
 		rval = xfs_dir2_node_removename(args);
 out_free:
+	if (offset)
+		*offset = args->offset;
+
 	kmem_free(args);
 	return rval;
 }
diff --git a/fs/xfs/libxfs/xfs_dir2.h b/fs/xfs/libxfs/xfs_dir2.h
index d96954478696..0c2d7c0af78f 100644
--- a/fs/xfs/libxfs/xfs_dir2.h
+++ b/fs/xfs/libxfs/xfs_dir2.h
@@ -46,7 +46,8 @@ extern int xfs_dir_lookup(struct xfs_trans *tp, struct xfs_inode *dp,
 				struct xfs_name *ci_name);
 extern int xfs_dir_removename(struct xfs_trans *tp, struct xfs_inode *dp,
 				struct xfs_name *name, xfs_ino_t ino,
-				xfs_extlen_t tot);
+				xfs_extlen_t tot,
+				xfs_dir2_dataptr_t *offset);
 extern int xfs_dir_replace(struct xfs_trans *tp, struct xfs_inode *dp,
 				const struct xfs_name *name, xfs_ino_t inum,
 				xfs_extlen_t tot);
diff --git a/fs/xfs/libxfs/xfs_dir2_block.c b/fs/xfs/libxfs/xfs_dir2_block.c
index 70aeab9d2a12..d36f3f1491da 100644
--- a/fs/xfs/libxfs/xfs_dir2_block.c
+++ b/fs/xfs/libxfs/xfs_dir2_block.c
@@ -810,9 +810,9 @@ xfs_dir2_block_removename(
 	/*
 	 * Point to the data entry using the leaf entry.
 	 */
+	args->offset = be32_to_cpu(blp[ent].address);
 	dep = (xfs_dir2_data_entry_t *)((char *)hdr +
-			xfs_dir2_dataptr_to_off(args->geo,
-						be32_to_cpu(blp[ent].address)));
+			xfs_dir2_dataptr_to_off(args->geo, args->offset));
 	/*
 	 * Mark the data entry's space free.
 	 */
diff --git a/fs/xfs/libxfs/xfs_dir2_leaf.c b/fs/xfs/libxfs/xfs_dir2_leaf.c
index 9ab520b66547..b4a066259d97 100644
--- a/fs/xfs/libxfs/xfs_dir2_leaf.c
+++ b/fs/xfs/libxfs/xfs_dir2_leaf.c
@@ -1386,9 +1386,10 @@ xfs_dir2_leaf_removename(
 	 * Point to the leaf entry, use that to point to the data entry.
 	 */
 	lep = &leafhdr.ents[index];
-	db = xfs_dir2_dataptr_to_db(geo, be32_to_cpu(lep->address));
+	args->offset = be32_to_cpu(lep->address);
+	db = xfs_dir2_dataptr_to_db(args->geo, args->offset);
 	dep = (xfs_dir2_data_entry_t *)((char *)hdr +
-		xfs_dir2_dataptr_to_off(geo, be32_to_cpu(lep->address)));
+		xfs_dir2_dataptr_to_off(args->geo, args->offset));
 	needscan = needlog = 0;
 	oldbest = be16_to_cpu(bf[0].length);
 	ltp = xfs_dir2_leaf_tail_p(geo, leaf);
diff --git a/fs/xfs/libxfs/xfs_dir2_node.c b/fs/xfs/libxfs/xfs_dir2_node.c
index 5a9513c036b8..39cbdeafa0f6 100644
--- a/fs/xfs/libxfs/xfs_dir2_node.c
+++ b/fs/xfs/libxfs/xfs_dir2_node.c
@@ -1296,9 +1296,10 @@ xfs_dir2_leafn_remove(
 	/*
 	 * Extract the data block and offset from the entry.
 	 */
-	db = xfs_dir2_dataptr_to_db(geo, be32_to_cpu(lep->address));
+	args->offset = be32_to_cpu(lep->address);
+	db = xfs_dir2_dataptr_to_db(args->geo, args->offset);
 	ASSERT(dblk->blkno == db);
-	off = xfs_dir2_dataptr_to_off(geo, be32_to_cpu(lep->address));
+	off = xfs_dir2_dataptr_to_off(args->geo, args->offset);
 	ASSERT(dblk->index == off);
 
 	/*
diff --git a/fs/xfs/libxfs/xfs_dir2_sf.c b/fs/xfs/libxfs/xfs_dir2_sf.c
index 44bc4ba3da8a..b49578a547b3 100644
--- a/fs/xfs/libxfs/xfs_dir2_sf.c
+++ b/fs/xfs/libxfs/xfs_dir2_sf.c
@@ -969,6 +969,8 @@ xfs_dir2_sf_removename(
 								XFS_CMP_EXACT) {
 			ASSERT(xfs_dir2_sf_get_ino(mp, sfp, sfep) ==
 			       args->inumber);
+			args->offset = xfs_dir2_byte_to_dataptr(
+						xfs_dir2_sf_get_offset(sfep));
 			break;
 		}
 	}
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index 143de4202cf4..e5ed8bdef9fe 100644
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -2508,7 +2508,7 @@ xfs_remove(
 	if (error)
 		goto out_trans_cancel;
 
-	error = xfs_dir_removename(tp, dp, name, ip->i_ino, resblks);
+	error = xfs_dir_removename(tp, dp, name, ip->i_ino, resblks, NULL);
 	if (error) {
 		ASSERT(error != -ENOENT);
 		goto out_trans_cancel;
@@ -3098,7 +3098,7 @@ xfs_rename(
 					spaceres);
 	else
 		error = xfs_dir_removename(tp, src_dp, src_name, src_ip->i_ino,
-					   spaceres);
+					   spaceres, NULL);
 
 	if (error)
 		goto out_trans_cancel;
-- 
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 ` allison.henderson [this message]
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 ` [PATCH v8 16/27] xfs: add parent attributes to link allison.henderson
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-10-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.