From: Eric Sandeen <sandeen@redhat.com>
To: linux-xfs@vger.kernel.org
Cc: "Darrick J. Wong" <darrick.wong@oracle.com>
Subject: [PATCH 2/2 V2] xfs_db: consolidate set_iocur_type() behavior
Date: Mon, 24 Aug 2020 11:51:56 -0500 [thread overview]
Message-ID: <bf4a939b-d02b-a916-62e0-e24b967eff38@redhat.com> (raw)
In-Reply-To: <8062b2d0-3fbb-0240-d5dd-c7bfb452f0b3@redhat.com>
Right now there are 3 cases to type_f(): inode type, type with fields,
and a default. The first two were added to address issues with handling
V5 metadata.
The first two already use some version of set_cur(), which handles all
of the validation etc. There's no reason to leave the open-coded bits
at the end, just send every non-inode type through set_cur() and be
done with it.
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
---
V2: Drop unused *bp var declaration
un-indent/un-else the non-inode code
diff --git a/db/io.c b/db/io.c
index 884da599..b8cb767e 100644
--- a/db/io.c
+++ b/db/io.c
@@ -586,7 +586,7 @@ void
set_iocur_type(
const typ_t *type)
{
- struct xfs_buf *bp = iocur_top->bp;
+ int bb_count = 1; /* type's size in basic blocks */
/*
* Inodes are special; verifier checks all inodes in the chunk, the
@@ -607,29 +607,10 @@ set_iocur_type(
}
/* adjust buffer size for types with fields & hence fsize() */
- if (type->fields) {
- int bb_count; /* type's size in basic blocks */
-
+ if (type->fields)
bb_count = BTOBB(byteize(fsize(type->fields,
- iocur_top->data, 0, 0)));
- set_cur(type, iocur_top->bb, bb_count, DB_RING_IGN, NULL);
- }
- iocur_top->typ = type;
-
- /* verify the buffer if the type has one. */
- if (!bp)
- return;
- if (!type->bops) {
- bp->b_ops = NULL;
- bp->b_flags |= LIBXFS_B_UNCHECKED;
- return;
- }
- if (!(bp->b_flags & LIBXFS_B_UPTODATE))
- return;
- bp->b_error = 0;
- bp->b_ops = type->bops;
- bp->b_ops->verify_read(bp);
- bp->b_flags &= ~LIBXFS_B_UNCHECKED;
+ iocur_top->data, 0, 0)));
+ set_cur(type, iocur_top->bb, bb_count, DB_RING_IGN, NULL);
}
static void
next prev parent reply other threads:[~2020-08-24 16:53 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-20 23:44 [PATCH 0/2] xfs_db: more type_f cleanups Eric Sandeen
2020-08-21 0:05 ` [PATCH 1/2] xfs_db: short circuit type_f if type is unchanged Eric Sandeen
2020-08-21 14:46 ` Darrick J. Wong
2020-08-21 15:46 ` Eric Sandeen
2020-08-21 0:09 ` [PATCH 2/2] xfs_db: consolidate set_iocur_type behavior Eric Sandeen
2020-08-21 14:52 ` Darrick J. Wong
2020-08-21 15:48 ` Eric Sandeen
2020-08-24 16:51 ` Eric Sandeen [this message]
2020-08-24 17:03 ` [PATCH 2/2 V2] xfs_db: consolidate set_iocur_type() behavior 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=bf4a939b-d02b-a916-62e0-e24b967eff38@redhat.com \
--to=sandeen@redhat.com \
--cc=darrick.wong@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.