From: "Darrick J. Wong" <djwong@kernel.org>
To: djwong@kernel.org, cem@kernel.org
Cc: linux-xfs@vger.kernel.org, allison.henderson@oracle.com,
catherine.hoang@oracle.com
Subject: [PATCH 25/30] libxfs: export attr3_leaf_hdr_from_disk via libxfs_api_defs.h
Date: Thu, 25 May 2023 19:28:20 -0700 [thread overview]
Message-ID: <168506078228.3749421.1486690706353918248.stgit@frogsfrogsfrogs> (raw)
In-Reply-To: <168506077876.3749421.7883085669588003826.stgit@frogsfrogsfrogs>
From: Darrick J. Wong <djwong@kernel.org>
Do the xfs -> libxfs switcheroo and cleanups separately so the next
patch doesn't become an even larger mess.
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
---
db/attr.c | 2 +-
db/metadump.c | 2 +-
libxfs/libxfs_api_defs.h | 5 +++++
repair/attr_repair.c | 6 +++---
4 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/db/attr.c b/db/attr.c
index 9e7bbd164df..95969d115d4 100644
--- a/db/attr.c
+++ b/db/attr.c
@@ -256,7 +256,7 @@ attr_leaf_entry_walk(
return 0;
off = byteize(startoff);
- xfs_attr3_leaf_hdr_from_disk(mp->m_attr_geo, &leafhdr, leaf);
+ libxfs_attr3_leaf_hdr_from_disk(mp->m_attr_geo, &leafhdr, leaf);
entries = xfs_attr3_leaf_entryp(leaf);
for (i = 0; i < leafhdr.count; i++) {
diff --git a/db/metadump.c b/db/metadump.c
index 9b036c7b5db..dc0c29ae45e 100644
--- a/db/metadump.c
+++ b/db/metadump.c
@@ -1704,7 +1704,7 @@ process_attr_block(
}
/* Ok, it's a leaf - get header; accounts for crc & non-crc */
- xfs_attr3_leaf_hdr_from_disk(mp->m_attr_geo, &hdr, leaf);
+ libxfs_attr3_leaf_hdr_from_disk(mp->m_attr_geo, &hdr, leaf);
nentries = hdr.count;
if (nentries == 0 ||
diff --git a/libxfs/libxfs_api_defs.h b/libxfs/libxfs_api_defs.h
index 7779040f0ba..7d1d1ddf624 100644
--- a/libxfs/libxfs_api_defs.h
+++ b/libxfs/libxfs_api_defs.h
@@ -36,7 +36,10 @@
#define xfs_ascii_ci_hashname libxfs_ascii_ci_hashname
+#define xfs_attr3_leaf_hdr_from_disk libxfs_attr3_leaf_hdr_from_disk
+#define xfs_attr3_leaf_read libxfs_attr3_leaf_read
#define xfs_attr_get libxfs_attr_get
+#define xfs_attr_is_leaf libxfs_attr_is_leaf
#define xfs_attr_leaf_newentsize libxfs_attr_leaf_newentsize
#define xfs_attr_namecheck libxfs_attr_namecheck
#define xfs_attr_set libxfs_attr_set
@@ -89,6 +92,7 @@
#define xfs_calc_dquots_per_chunk libxfs_calc_dquots_per_chunk
#define xfs_create_space_res libxfs_create_space_res
#define xfs_da3_node_hdr_from_disk libxfs_da3_node_hdr_from_disk
+#define xfs_da3_node_read libxfs_da3_node_read
#define xfs_da_get_buf libxfs_da_get_buf
#define xfs_da_hashname libxfs_da_hashname
#define xfs_da_read_buf libxfs_da_read_buf
@@ -161,6 +165,7 @@
#define xfs_inobt_stage_cursor libxfs_inobt_stage_cursor
#define xfs_inode_from_disk libxfs_inode_from_disk
#define xfs_inode_from_disk_ts libxfs_inode_from_disk_ts
+#define xfs_inode_hasattr libxfs_inode_hasattr
#define xfs_inode_to_disk libxfs_inode_to_disk
#define xfs_inode_validate_cowextsize libxfs_inode_validate_cowextsize
#define xfs_inode_validate_extsize libxfs_inode_validate_extsize
diff --git a/repair/attr_repair.c b/repair/attr_repair.c
index afe8073ca8e..d3fd7a47a5b 100644
--- a/repair/attr_repair.c
+++ b/repair/attr_repair.c
@@ -579,7 +579,7 @@ process_leaf_attr_block(
da_freemap_t *attr_freemap;
struct xfs_attr3_icleaf_hdr leafhdr;
- xfs_attr3_leaf_hdr_from_disk(mp->m_attr_geo, &leafhdr, leaf);
+ libxfs_attr3_leaf_hdr_from_disk(mp->m_attr_geo, &leafhdr, leaf);
clearit = usedbs = 0;
firstb = mp->m_sb.sb_blocksize;
stop = xfs_attr3_leaf_hdr_size(leaf);
@@ -802,7 +802,7 @@ process_leaf_attr_level(xfs_mount_t *mp,
}
leaf = bp->b_addr;
- xfs_attr3_leaf_hdr_from_disk(mp->m_attr_geo, &leafhdr, leaf);
+ libxfs_attr3_leaf_hdr_from_disk(mp->m_attr_geo, &leafhdr, leaf);
/* check magic number for leaf directory btree block */
if (!(leafhdr.magic == XFS_ATTR_LEAF_MAGIC ||
@@ -1000,7 +1000,7 @@ process_longform_leaf_root(
* check sibling pointers in leaf block or root block 0 before
* we have to release the btree block
*/
- xfs_attr3_leaf_hdr_from_disk(mp->m_attr_geo, &leafhdr, bp->b_addr);
+ libxfs_attr3_leaf_hdr_from_disk(mp->m_attr_geo, &leafhdr, bp->b_addr);
if (leafhdr.forw != 0 || leafhdr.back != 0) {
if (!no_modify) {
do_warn(
next prev parent reply other threads:[~2023-05-26 2:28 UTC|newest]
Thread overview: 134+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-26 0:07 [RFC MEGAPATCHSET v12 1/2] xfs: parent pointers and online repair part 2 Darrick J. Wong
2023-05-26 2:00 ` [PATCHSET RFC v12.0 00/11] fstests: adjust tests for xfs parent pointers Darrick J. Wong
2023-05-26 2:02 ` [PATCH 01/11] xfs/206: filter out the parent= status from mkfs Darrick J. Wong
2023-05-26 2:02 ` [PATCH 02/11] xfs/122: update for parent pointers Darrick J. Wong
2023-05-26 2:02 ` [PATCH 03/11] populate: create hardlinks " Darrick J. Wong
2023-05-26 2:03 ` [PATCH 04/11] xfs/021: adapt golden output files " Darrick J. Wong
2023-05-26 2:03 ` [PATCH 05/11] generic/050: adapt " Darrick J. Wong
2023-05-26 2:03 ` [PATCH 06/11] xfs/018: disable parent pointers for this test Darrick J. Wong
2023-05-26 20:01 ` Zorro Lang
2023-06-02 1:06 ` Darrick J. Wong
2023-06-02 10:27 ` Zorro Lang
2023-06-02 14:29 ` Darrick J. Wong
2023-05-26 2:03 ` [PATCH 07/11] xfs/306: fix formatting failures with parent pointers Darrick J. Wong
2023-05-26 2:04 ` [PATCH 08/11] common: add helpers for parent pointer tests Darrick J. Wong
2023-05-26 2:04 ` [PATCH 09/11] xfs: add parent pointer test Darrick J. Wong
2023-05-26 2:04 ` [PATCH 10/11] xfs: add multi link " Darrick J. Wong
2023-05-26 2:04 ` [PATCH 11/11] xfs: add parent pointer inject test Darrick J. Wong
2023-05-26 2:00 ` [PATCHSET v12.0 0/7] xfs: retain ILOCK during directory updates Darrick J. Wong
2023-05-26 2:05 ` [PATCH 1/7] xfs: Increase XFS_DEFER_OPS_NR_INODES to 5 Darrick J. Wong
2023-05-26 2:05 ` [PATCH 2/7] xfs: Increase XFS_QM_TRANS_MAXDQS " Darrick J. Wong
2023-05-26 2:05 ` [PATCH 3/7] xfs: Hold inode locks in xfs_ialloc Darrick J. Wong
2023-05-26 2:06 ` [PATCH 4/7] xfs: Hold inode locks in xfs_trans_alloc_dir Darrick J. Wong
2023-05-26 2:06 ` [PATCH 5/7] xfs: Hold inode locks in xfs_rename Darrick J. Wong
2023-05-26 2:06 ` [PATCH 6/7] xfs: don't pick up IOLOCK during rmapbt repair scan Darrick J. Wong
2023-05-26 2:06 ` [PATCH 7/7] xfs: unlock new repair tempfiles after creation Darrick J. Wong
2023-05-26 2:00 ` [PATCHSET v12.0 00/12] xfs: name-value xattr lookups Darrick J. Wong
2023-05-26 2:07 ` [PATCH 01/12] xfs: check opcode and iovec count match in xlog_recover_attri_commit_pass2 Darrick J. Wong
2023-05-26 2:07 ` [PATCH 02/12] xfs: make xfs_attr_set require XFS_DA_OP_REMOVE Darrick J. Wong
2023-05-26 2:07 ` [PATCH 03/12] xfs: allow xattr matching on name and value for local/sf attrs Darrick J. Wong
2023-05-26 2:07 ` [PATCH 04/12] xfs: preserve NVLOOKUP in xfs_attr_set Darrick J. Wong
2023-05-26 2:08 ` [PATCH 05/12] xfs: restructure xfs_attr_complete_op a bit Darrick J. Wong
2023-05-26 2:08 ` [PATCH 06/12] xfs: use helpers to extract xattr op from opflags Darrick J. Wong
2023-05-26 2:08 ` [PATCH 07/12] xfs: validate recovered name buffers when recovering xattr items Darrick J. Wong
2023-05-26 2:08 ` [PATCH 08/12] xfs: always set args->value in xfs_attri_item_recover Darrick J. Wong
2023-05-26 2:09 ` [PATCH 09/12] xfs: use local variables for name and value length in _attri_commit_pass2 Darrick J. Wong
2023-05-26 2:09 ` [PATCH 10/12] xfs: log NVLOOKUP xattr removal operations Darrick J. Wong
2023-05-26 2:09 ` [PATCH 11/12] xfs: log NVLOOKUP xattr setting operations Darrick J. Wong
2023-05-26 2:09 ` [PATCH 12/12] xfs: log NVLOOKUP xattr nvreplace operations Darrick J. Wong
2023-05-26 2:00 ` [PATCHSET v12.0 00/18] xfs: Parent Pointers Darrick J. Wong
2023-05-26 2:10 ` [PATCH 01/18] xfs: add parent pointer support to attribute code Darrick J. Wong
2023-05-26 2:10 ` [PATCH 02/18] xfs: define parent pointer ondisk extended attribute format Darrick J. Wong
2023-05-26 2:10 ` [PATCH 03/18] xfs: add parent pointer validator functions Darrick J. Wong
2023-05-26 2:10 ` [PATCH 04/18] xfs: extend transaction reservations for parent attributes Darrick J. Wong
2023-05-26 2:11 ` [PATCH 05/18] xfs: parent pointer attribute creation Darrick J. Wong
2023-05-26 2:11 ` [PATCH 06/18] xfs: add parent attributes to link Darrick J. Wong
2023-05-26 2:11 ` [PATCH 07/18] xfs: add parent attributes to symlink Darrick J. Wong
2023-05-26 2:11 ` [PATCH 08/18] xfs: remove parent pointers in unlink Darrick J. Wong
2023-05-26 2:12 ` [PATCH 09/18] xfs: Indent xfs_rename Darrick J. Wong
2023-05-26 2:12 ` [PATCH 10/18] xfs: Add parent pointers to rename Darrick J. Wong
2023-05-26 2:12 ` [PATCH 11/18] xfs: Add parent pointers to xfs_cross_rename Darrick J. Wong
2023-05-26 2:13 ` [PATCH 12/18] xfs: Filter XFS_ATTR_PARENT for getfattr Darrick J. Wong
2023-05-26 2:13 ` [PATCH 13/18] xfs: pass the attr value to put_listent when possible Darrick J. Wong
2023-05-26 2:13 ` [PATCH 14/18] xfs: Add parent pointer ioctl Darrick J. Wong
2023-05-26 2:13 ` [PATCH 15/18] xfs: fix unit conversion error in xfs_log_calc_max_attrsetm_res Darrick J. Wong
2023-05-26 2:14 ` [PATCH 16/18] xfs: drop compatibility minimum log size computations for reflink Darrick J. Wong
2023-05-26 2:14 ` [PATCH 17/18] xfs: don't remove the attr fork when parent pointers are enabled Darrick J. Wong
2023-05-26 2:14 ` [PATCH 18/18] xfs: Add the parent pointer support to the superblock version 5 Darrick J. Wong
2023-05-26 2:01 ` [PATCHSET v12.0 00/17] xfs: fsck for parent pointers Darrick J. Wong
2023-05-26 2:14 ` [PATCH 01/17] xfs: check dirents have " Darrick J. Wong
2023-05-26 2:15 ` [PATCH 02/17] xfs: deferred scrub of dirents Darrick J. Wong
2023-05-26 2:15 ` [PATCH 03/17] xfs: scrub parent pointers Darrick J. Wong
2023-05-26 2:15 ` [PATCH 04/17] xfs: deferred scrub of " Darrick J. Wong
2023-05-26 2:15 ` [PATCH 05/17] xfs: add raw parent pointer apis to support repair Darrick J. Wong
2023-05-26 2:16 ` [PATCH 06/17] xfs: set child file owner in xfs_da_args when changing parent pointers Darrick J. Wong
2023-05-26 2:16 ` [PATCH 07/17] xfs: salvage parent pointers when rebuilding xattr structures Darrick J. Wong
2023-05-26 2:16 ` [PATCH 08/17] xfs: teach the adoption code about parent pointers Darrick J. Wong
2023-05-26 2:16 ` [PATCH 09/17] xfs: replace namebuf with parent pointer in directory repair Darrick J. Wong
2023-05-26 2:17 ` [PATCH 10/17] xfs: repair directories by scanning directory parent pointers Darrick J. Wong
2023-05-26 2:17 ` [PATCH 11/17] xfs: implement live updates for directory repairs Darrick J. Wong
2023-05-26 2:17 ` [PATCH 12/17] xfs: replay unlocked parent pointer updates that accrue during xattr repair Darrick J. Wong
2023-05-26 2:17 ` [PATCH 13/17] xfs: replace namebuf with parent pointer in parent pointer repair Darrick J. Wong
2023-05-26 2:18 ` [PATCH 14/17] xfs: repair directory parent pointers by scanning for dirents Darrick J. Wong
2023-05-26 2:18 ` [PATCH 15/17] xfs: implement live updates for parent pointer repairs Darrick J. Wong
2023-05-26 2:18 ` [PATCH 16/17] xfs: remove pointless unlocked assertion Darrick J. Wong
2023-05-26 2:18 ` [PATCH 17/17] xfs: actually rebuild the parent pointer xattrs Darrick J. Wong
2023-05-26 2:01 ` [PATCHSET v12.0 0/1] xfsprogs: retain ILOCK during directory updates Darrick J. Wong
2023-05-26 2:19 ` [PATCH 1/1] xfs: Increase XFS_DEFER_OPS_NR_INODES to 5 Darrick J. Wong
2023-05-26 2:01 ` [PATCHSET v12.0 00/10] xfsprogs: name-value xattr lookups Darrick J. Wong
2023-05-26 2:19 ` [PATCH 01/10] xfs: make xfs_attr_set require XFS_DA_OP_REMOVE Darrick J. Wong
2023-05-26 2:19 ` [PATCH 02/10] xfs: allow xattr matching on name and value for local/sf attrs Darrick J. Wong
2023-05-26 2:20 ` [PATCH 03/10] xfs: preserve NVLOOKUP in xfs_attr_set Darrick J. Wong
2023-05-26 2:20 ` [PATCH 04/10] xfs: restructure xfs_attr_complete_op a bit Darrick J. Wong
2023-05-26 2:20 ` [PATCH 05/10] xfs: use helpers to extract xattr op from opflags Darrick J. Wong
2023-05-26 2:20 ` [PATCH 06/10] xfs: log NVLOOKUP xattr removal operations Darrick J. Wong
2023-05-26 2:21 ` [PATCH 07/10] xfs: log NVLOOKUP xattr setting operations Darrick J. Wong
2023-05-26 2:21 ` [PATCH 08/10] xfs: log NVLOOKUP xattr nvreplace operations Darrick J. Wong
2023-05-26 2:21 ` [PATCH 09/10] xfs_logprint: dump new attr log item fields Darrick J. Wong
2023-05-26 2:21 ` [PATCH 10/10] xfs_logprint: print missing attri header fields Darrick J. Wong
2023-05-26 2:01 ` [PATCHSET v12.0 00/30] xfsprogs: Parent Pointers Darrick J. Wong
2023-05-26 2:22 ` [PATCH 01/30] xfs: add parent pointer support to attribute code Darrick J. Wong
2023-05-26 2:22 ` [PATCH 02/30] xfs: define parent pointer ondisk extended attribute format Darrick J. Wong
2023-05-26 2:22 ` [PATCH 03/30] xfs: add parent pointer validator functions Darrick J. Wong
2023-05-26 2:22 ` [PATCH 04/30] xfs: extend transaction reservations for parent attributes Darrick J. Wong
2023-05-26 2:23 ` [PATCH 05/30] xfs: parent pointer attribute creation Darrick J. Wong
2023-05-26 2:23 ` [PATCH 06/30] xfs: add parent attributes to link Darrick J. Wong
2023-05-26 2:23 ` [PATCH 07/30] xfs: add parent attributes to symlink Darrick J. Wong
2023-05-26 2:23 ` [PATCH 08/30] xfs: remove parent pointers in unlink Darrick J. Wong
2023-05-26 2:24 ` [PATCH 09/30] xfs: Add parent pointers to rename Darrick J. Wong
2023-05-26 2:24 ` [PATCH 10/30] xfs: pass the attr value to put_listent when possible Darrick J. Wong
2023-05-26 2:24 ` [PATCH 11/30] xfs: Add parent pointer ioctl Darrick J. Wong
2023-05-26 2:24 ` [PATCH 12/30] xfs: fix unit conversion error in xfs_log_calc_max_attrsetm_res Darrick J. Wong
2023-05-26 2:25 ` [PATCH 13/30] xfs: drop compatibility minimum log size computations for reflink Darrick J. Wong
2023-05-26 2:25 ` [PATCH 14/30] xfs: don't remove the attr fork when parent pointers are enabled Darrick J. Wong
2023-05-26 2:25 ` [PATCH 15/30] xfs: Add the parent pointer support to the superblock version 5 Darrick J. Wong
2023-05-26 2:26 ` [PATCH 16/30] libfrog: add parent pointer support code Darrick J. Wong
2023-05-26 2:26 ` [PATCH 17/30] xfs_io: adapt parent command to new parent pointer ioctls Darrick J. Wong
2023-05-26 2:26 ` [PATCH 18/30] xfs_io: Add i, n and f flags to parent command Darrick J. Wong
2023-05-26 2:26 ` [PATCH 19/30] xfs_logprint: decode parent pointers in ATTRI items fully Darrick J. Wong
2023-05-26 2:27 ` [PATCH 20/30] xfs_spaceman: report file paths Darrick J. Wong
2023-05-26 2:27 ` [PATCH 21/30] xfs_scrub: use parent pointers when possible to report file operations Darrick J. Wong
2023-05-26 2:27 ` [PATCH 22/30] xfs_db: report parent bit on xattrs Darrick J. Wong
2023-05-26 2:27 ` [PATCH 23/30] xfs_db: report parent pointers embedded in xattrs Darrick J. Wong
2023-05-26 2:28 ` [PATCH 24/30] xfs_db: obfuscate dirent and parent pointer names consistently Darrick J. Wong
2023-05-26 2:28 ` Darrick J. Wong [this message]
2023-05-26 2:28 ` [PATCH 26/30] xfs_db: add a parents command to list the parents of a file Darrick J. Wong
2023-05-26 2:28 ` [PATCH 27/30] libxfs: create new files with attr forks if necessary Darrick J. Wong
2023-05-26 2:29 ` [PATCH 28/30] xfsprogs: Fix default superblock attr bits Darrick J. Wong
2023-05-26 2:29 ` [PATCH 29/30] mkfs: Add parent pointers during protofile creation Darrick J. Wong
2023-05-26 2:29 ` [PATCH 30/30] mkfs: enable formatting with parent pointers Darrick J. Wong
2023-05-26 2:02 ` [PATCHSET v12.0 00/14] xfsprogs: fsck for " Darrick J. Wong
2023-05-26 2:29 ` [PATCH 01/14] xfs: create a blob array data structure Darrick J. Wong
2023-05-26 2:30 ` [PATCH 02/14] xfs: check dirents have parent pointers Darrick J. Wong
2023-05-26 2:30 ` [PATCH 03/14] xfs: add raw parent pointer apis to support repair Darrick J. Wong
2023-05-26 2:30 ` [PATCH 04/14] xfs: set child file owner in xfs_da_args when changing parent pointers Darrick J. Wong
2023-05-26 2:30 ` [PATCH 05/14] xfs: remove pointless unlocked assertion Darrick J. Wong
2023-05-26 2:31 ` [PATCH 06/14] xfs_repair: add parent pointers when messing with /lost+found Darrick J. Wong
2023-05-26 2:31 ` [PATCH 07/14] xfs_repair: build a parent pointer index Darrick J. Wong
2023-05-26 2:31 ` [PATCH 08/14] xfs_repair: move the global dirent name store to a separate object Darrick J. Wong
2023-05-26 2:31 ` [PATCH 09/14] xfs_repair: deduplicate strings stored in string blob Darrick J. Wong
2023-05-26 2:32 ` [PATCH 10/14] xfs_repair: check parent pointers Darrick J. Wong
2023-05-26 2:32 ` [PATCH 11/14] xfs_repair: dump garbage parent pointer attributes Darrick J. Wong
2023-05-26 2:32 ` [PATCH 12/14] xfs_repair: update ondisk parent pointer records Darrick J. Wong
2023-05-26 2:33 ` [PATCH 13/14] xfs_repair: wipe ondisk parent pointers when there are none Darrick J. Wong
2023-05-26 2:33 ` [PATCH 14/14] xfs_scrub: use parent pointers to report lost file data 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=168506078228.3749421.1486690706353918248.stgit@frogsfrogsfrogs \
--to=djwong@kernel.org \
--cc=allison.henderson@oracle.com \
--cc=catherine.hoang@oracle.com \
--cc=cem@kernel.org \
--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.