From: Dave Chinner <david@fromorbit.com>
To: xfs@oss.sgi.com
Subject: [PATCH 3/6] xfs_db: factor some common dir2 field parsing code.
Date: Mon, 20 May 2013 16:53:00 +1000 [thread overview]
Message-ID: <1369032783-24973-4-git-send-email-david@fromorbit.com> (raw)
In-Reply-To: <1369032783-24973-1-git-send-email-david@fromorbit.com>
From: Dave Chinner <dchinner@redhat.com>
Why duplicate it?
Signed-off-by: Dave Chinner <dchinner@redhat.com>
---
db/dir2.c | 172 ++++++++++++++++++++++++++++++-------------------------------
1 file changed, 84 insertions(+), 88 deletions(-)
diff --git a/db/dir2.c b/db/dir2.c
index 90378e6..594d9d2 100644
--- a/db/dir2.c
+++ b/db/dir2.c
@@ -189,6 +189,72 @@ const field_t da_node_hdr_flds[] = {
{ NULL }
};
+/*
+ * Worker functions shared between either dir2/dir3 or block/data formats
+ */
+static int
+__dir2_block_tail_offset(
+ struct xfs_dir2_data_hdr *block,
+ int startoff,
+ int idx)
+{
+ struct xfs_dir2_block_tail *btp;
+
+ ASSERT(startoff == 0);
+ ASSERT(idx == 0);
+ btp = xfs_dir2_block_tail_p(mp, block);
+ return bitize((int)((char *)btp - (char *)block));
+}
+
+static int
+__dir2_data_entries_count(
+ char *ptr,
+ char *endptr)
+{
+ int i;
+
+ for (i = 0; ptr < endptr; i++) {
+ struct xfs_dir2_data_entry *dep;
+ struct xfs_dir2_data_unused *dup;
+
+ dup = (xfs_dir2_data_unused_t *)ptr;
+ if (be16_to_cpu(dup->freetag) == XFS_DIR2_DATA_FREE_TAG)
+ ptr += be16_to_cpu(dup->length);
+ else {
+ dep = (xfs_dir2_data_entry_t *)ptr;
+ ptr += xfs_dir2_data_entsize(dep->namelen);
+ }
+ }
+ return i;
+}
+
+static char *
+__dir2_data_entry_offset(
+ char *ptr,
+ char *endptr,
+ int idx)
+{
+ int i;
+
+ for (i = 0; i < idx; i++) {
+ struct xfs_dir2_data_entry *dep;
+ struct xfs_dir2_data_unused *dup;
+
+ ASSERT(ptr < endptr);
+ dup = (xfs_dir2_data_unused_t *)ptr;
+ if (be16_to_cpu(dup->freetag) == XFS_DIR2_DATA_FREE_TAG)
+ ptr += be16_to_cpu(dup->length);
+ else {
+ dep = (xfs_dir2_data_entry_t *)ptr;
+ ptr += xfs_dir2_data_entsize(dep->namelen);
+ }
+ }
+ return ptr;
+}
+
+/*
+ * Block format functions
+ */
static int
dir2_block_hdr_count(
void *obj,
@@ -254,86 +320,50 @@ dir2_block_tail_offset(
int startoff,
int idx)
{
- struct xfs_dir2_data_hdr *block;
- struct xfs_dir2_block_tail *btp;
+ struct xfs_dir2_data_hdr *block = obj;
- ASSERT(startoff == 0);
- ASSERT(idx == 0);
- block = obj;
ASSERT(be32_to_cpu(block->magic) == XFS_DIR2_BLOCK_MAGIC);
- btp = xfs_dir2_block_tail_p(mp, block);
- return bitize((int)((char *)btp - (char *)block));
+ return __dir2_block_tail_offset(block, startoff, idx);
}
-/*ARGSUSED*/
static int
dir2_block_u_count(
void *obj,
int startoff)
{
- struct xfs_dir2_data_hdr *block;
+ struct xfs_dir2_data_hdr *block = obj;
struct xfs_dir2_block_tail *btp;
- char *endptr;
- int i;
- char *ptr;
ASSERT(startoff == 0);
- block = obj;
if (be32_to_cpu(block->magic) != XFS_DIR2_BLOCK_MAGIC)
return 0;
- btp = xfs_dir2_block_tail_p(mp, block);
- ptr = (char *)xfs_dir3_data_unused_p(block);
- endptr = (char *)xfs_dir2_block_leaf_p(btp);
- for (i = 0; ptr < endptr; i++) {
- struct xfs_dir2_data_entry *dep;
- struct xfs_dir2_data_unused *dup;
- dup = (xfs_dir2_data_unused_t *)ptr;
- if (be16_to_cpu(dup->freetag) == XFS_DIR2_DATA_FREE_TAG)
- ptr += be16_to_cpu(dup->length);
- else {
- dep = (xfs_dir2_data_entry_t *)ptr;
- ptr += xfs_dir2_data_entsize(dep->namelen);
- }
- }
- return i;
+ btp = xfs_dir2_block_tail_p(mp, block);
+ return __dir2_data_entries_count((char *)xfs_dir3_data_unused_p(block),
+ (char *)xfs_dir2_block_leaf_p(btp));
}
-/*ARGSUSED*/
static int
dir2_block_u_offset(
void *obj,
int startoff,
int idx)
{
- struct xfs_dir2_data_hdr *block;
+ struct xfs_dir2_data_hdr *block = obj;
struct xfs_dir2_block_tail *btp;
- char *endptr;
- int i;
char *ptr;
ASSERT(startoff == 0);
- block = obj;
ASSERT(be32_to_cpu(block->magic) == XFS_DIR2_BLOCK_MAGIC);
btp = xfs_dir2_block_tail_p(mp, block);
- ptr = (char *)xfs_dir3_data_unused_p(block);
- endptr = (char *)xfs_dir2_block_leaf_p(btp);
- for (i = 0; i < idx; i++) {
- struct xfs_dir2_data_entry *dep;
- struct xfs_dir2_data_unused *dup;
-
- ASSERT(ptr < endptr);
- dup = (xfs_dir2_data_unused_t *)ptr;
- if (be16_to_cpu(dup->freetag) == XFS_DIR2_DATA_FREE_TAG)
- ptr += be16_to_cpu(dup->length);
- else {
- dep = (xfs_dir2_data_entry_t *)ptr;
- ptr += xfs_dir2_data_entsize(dep->namelen);
- }
- }
+ ptr = __dir2_data_entry_offset((char *)xfs_dir3_data_unused_p(block),
+ (char *)xfs_dir2_block_leaf_p(btp), idx);
return bitize((int)(ptr - (char *)block));
}
+/*
+ * Data block format functions
+ */
static int
dir2_data_union_freetag_count(
void *obj,
@@ -489,66 +519,32 @@ dir2_data_u_count(
void *obj,
int startoff)
{
- struct xfs_dir2_data_hdr *data;
- char *endptr;
- int i;
- char *ptr;
+ struct xfs_dir2_data_hdr *data = obj;
ASSERT(startoff == 0);
- data = obj;
if (be32_to_cpu(data->magic) != XFS_DIR2_DATA_MAGIC)
return 0;
- ptr = (char *)xfs_dir3_data_unused_p(data);
- endptr = (char *)data + mp->m_dirblksize;
- for (i = 0; ptr < endptr; i++) {
- struct xfs_dir2_data_entry *dep;
- struct xfs_dir2_data_unused *dup;
- dup = (xfs_dir2_data_unused_t *)ptr;
- if (be16_to_cpu(dup->freetag) == XFS_DIR2_DATA_FREE_TAG)
- ptr += be16_to_cpu(dup->length);
- else {
- dep = (xfs_dir2_data_entry_t *)ptr;
- ptr += xfs_dir2_data_entsize(dep->namelen);
- }
- }
- return i;
+ return __dir2_data_entries_count((char *)xfs_dir3_data_unused_p(data),
+ (char *)data + mp->m_dirblksize);
}
-/*ARGSUSED*/
static int
dir2_data_u_offset(
void *obj,
int startoff,
int idx)
{
- struct xfs_dir2_data_hdr *data;
- char *endptr;
- int i;
+ struct xfs_dir2_data_hdr *data = obj;
char *ptr;
ASSERT(startoff == 0);
- data = obj;
ASSERT(be32_to_cpu(data->magic) == XFS_DIR2_DATA_MAGIC);
- ptr = (char *)xfs_dir3_data_unused_p(data);
- endptr = (char *)data + mp->m_dirblksize;
- for (i = 0; i < idx; i++) {
- struct xfs_dir2_data_entry *dep;
- struct xfs_dir2_data_unused *dup;
-
- ASSERT(ptr < endptr);
- dup = (xfs_dir2_data_unused_t *)ptr;
- if (be16_to_cpu(dup->freetag) == XFS_DIR2_DATA_FREE_TAG)
- ptr += be16_to_cpu(dup->length);
- else {
- dep = (xfs_dir2_data_entry_t *)ptr;
- ptr += xfs_dir2_data_entsize(dep->namelen);
- }
- }
+ ptr = __dir2_data_entry_offset((char *)xfs_dir3_data_unused_p(data),
+ (char *)data + mp->m_dirblksize, idx);
return bitize((int)(ptr - (char *)data));
}
-/*ARGSUSED*/
int
dir2_data_union_size(
void *obj,
--
1.7.10.4
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2013-05-20 6:53 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-17 11:12 [PATCH 00/30] xfsprogs: Initial CRC support Dave Chinner
2013-05-17 11:12 ` [PATCH 01/30] mkfs: fix realtime device initialisation Dave Chinner
2013-07-22 20:46 ` Ben Myers
2013-05-17 11:12 ` [PATCH 02/30] logprint: fix wrapped log dump issue Dave Chinner
2013-05-17 11:12 ` [PATCH 03/30] libxfs: add crc format changes to generic btrees Dave Chinner
2013-05-17 11:12 ` [PATCH 04/30] xfsprogs: add crc format chagnes to ag headers Dave Chinner
2013-05-17 11:13 ` [PATCH 05/30] xfsprogs: Support new AGFL format Dave Chinner
2013-05-17 11:13 ` [PATCH 06/30] libxfs: change quota buffer formats Dave Chinner
2013-05-17 11:13 ` [PATCH 07/30] libxfs: add version 3 inode support Dave Chinner
2013-05-17 11:13 ` [PATCH 08/30] libxfs: add support for crc headers on remote symlinks Dave Chinner
2013-05-17 11:13 ` [PATCH 09/30] xfs: add CRC checks to block format directory blocks Dave Chinner
2013-05-17 11:13 ` [PATCH 10/30] xfs: add CRC checking to dir2 free blocks Dave Chinner
2013-05-17 11:13 ` [PATCH 11/30] xfs: add CRC checking to dir2 data blocks Dave Chinner
2013-05-17 11:13 ` [PATCH 12/30] xfs: add CRC checking to dir2 leaf blocks Dave Chinner
2013-05-17 11:13 ` [PATCH 13/30] xfs: shortform directory offsets change for dir3 format Dave Chinner
2013-05-17 11:13 ` [PATCH 14/30] xfs: add CRCs to dir2/da node blocks Dave Chinner
2013-05-17 11:13 ` [PATCH 15/30] xfs: add CRCs to attr leaf blocks Dave Chinner
2013-05-17 11:13 ` [PATCH 16/30] xfs: split remote attribute code out Dave Chinner
2013-05-17 11:13 ` [PATCH 17/30] xfs: add CRC protection to remote attributes Dave Chinner
2013-05-17 11:13 ` [PATCH 18/30] xfs: add buffer types to directory and attribute buffers Dave Chinner
2013-05-17 11:13 ` [PATCH 19/30] xfs: buffer type overruns blf_flags field Dave Chinner
2013-05-17 11:13 ` [PATCH 20/30] xfs: add CRC checks to the superblock Dave Chinner
2013-05-17 11:13 ` [PATCH 21/30] xfs: implement extended feature masks Dave Chinner
2013-05-17 11:13 ` [PATCH 22/30] xfsprogs: Add verifiers to libxfs buffer interfaces Dave Chinner
2013-05-17 11:13 ` [PATCH 23/30] patch xfsprogs-mkfs-crc-support-2 Dave Chinner
2013-05-17 11:13 ` [PATCH 24/30] xfsprogs: add crc format support to repair Dave Chinner
2013-05-17 11:13 ` [PATCH 25/30] xfs_repair: update for dir/attr crc format changes Dave Chinner
2013-05-17 11:13 ` [PATCH 26/30] xfsprogs: disable xfs_check for CRC enabled filesystems Dave Chinner
2013-05-17 11:13 ` [PATCH 27/30] xfs_db: disable modification for CRC enabled filessytems Dave Chinner
2013-05-17 11:13 ` [PATCH 28/30] libxfs: determine inode size from version number, not struct xfs_dinode Dave Chinner
2013-05-17 11:13 ` [PATCH 29/30] xfsdb: support version 5 superblock in versionnum command Dave Chinner
2013-05-17 11:13 ` [PATCH 30/30] xfsprogs: add crc format support to db Dave Chinner
2013-05-17 20:54 ` [PATCH 00/30] xfsprogs: Initial CRC support Michael L. Semon
2013-05-18 3:25 ` Dave Chinner
2013-05-18 5:07 ` Jeff Liu
2013-05-18 5:39 ` Dave Chinner
2013-05-18 6:27 ` Michael L. Semon
2013-05-18 8:46 ` Jeff Liu
2013-05-18 5:40 ` Michael L. Semon
2013-05-18 6:27 ` Dave Chinner
2013-05-18 7:42 ` Michael L. Semon
2013-05-18 18:13 ` Michael L. Semon
2013-05-20 6:52 ` [PATCH 0/6] xfsprogs: more CRC support patches Dave Chinner
2013-05-20 6:52 ` [PATCH 1/6] xfs_repair: always use incore header for directory block checks Dave Chinner
2013-05-20 6:52 ` [PATCH 2/6] xfs_db: convert directory parsing to use libxfs structure Dave Chinner
2013-05-20 6:53 ` Dave Chinner [this message]
2013-05-20 6:53 ` [PATCH 4/6] xfs_db: update field printing for dir crc format changes Dave Chinner
2013-05-20 6:53 ` [PATCH 5/6] xfs_repair: convert directory parsing to use libxfs structure Dave Chinner
2013-05-20 6:53 ` [PATCH 6/6] xfs_repair: make directory freespace table CRC format aware Dave Chinner
2013-05-20 16:11 ` [PATCH 0/6] xfsprogs: more CRC support patches Michael L. Semon
2013-05-23 12:36 ` [PATCH 0/2] xfsprogs: yet " Dave Chinner
2013-05-23 12:36 ` [PATCH 1/2] xfs_db: add CRC information to dquot output Dave Chinner
2013-05-23 12:36 ` [PATCH 2/2] xfs_db: add CRC support for attribute fork structures Dave Chinner
2013-05-27 7:14 ` [PATCH 0/4] xfsprogs: more CRC patches Dave Chinner
2013-05-27 7:14 ` [PATCH 1/4] mkfs.xfs: validate options for CRCs up front Dave Chinner
2013-05-27 7:14 ` [PATCH 2/4] xfsprogs: support CRC enabled filesystem detection Dave Chinner
2013-05-27 7:14 ` [PATCH 3/4] xfs_mdrestore: recalculate sb CRC before writing Dave Chinner
2013-05-27 7:14 ` [PATCH 4/4] xfs_metadump: requires some object CRC recalculation Dave Chinner
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=1369032783-24973-4-git-send-email-david@fromorbit.com \
--to=david@fromorbit.com \
--cc=xfs@oss.sgi.com \
/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