From: Zorro Lang <zlang@redhat.com>
To: linux-xfs@vger.kernel.org
Subject: [PATCH] xfs_db: use correct inode to set inode type
Date: Thu, 13 Aug 2020 14:03:24 +0800 [thread overview]
Message-ID: <20200813060324.8159-1-zlang@redhat.com> (raw)
A test fails as:
# xfs_db -c "inode 133" -c "addr" -c "p core.size" -c "type inode" -c "addr" -c "p core.size" /dev/sdb1
current
byte offset 68096, length 512
buffer block 128 (fsbno 16), 32 bbs
inode 133, dir inode -1, type inode
core.size = 123142
current
byte offset 65536, length 512
buffer block 128 (fsbno 16), 32 bbs
inode 128, dir inode 128, type inode
core.size = 42
The "type inode" get wrong inode addr due to it trys to get the
beginning of an inode chunk, refer to "533d1d229 xfs_db: properly set
inode type".
We don't need to get the beginning of a chunk in set_iocur_type, due
to set_cur_inode(ino) will help to do all of that and make a proper
verification. We just need to give it a correct inode.
Reported-by: Jianhong Yin <jiyin@redhat.com>
Signed-off-by: Zorro Lang <zlang@redhat.com>
---
db/io.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/db/io.c b/db/io.c
index 6628d061..61940a07 100644
--- a/db/io.c
+++ b/db/io.c
@@ -591,6 +591,7 @@ set_iocur_type(
/* Inodes are special; verifier checks all inodes in the chunk */
if (type->typnm == TYP_INODE) {
xfs_daddr_t b = iocur_top->bb;
+ int bo = iocur_top->boff;
xfs_ino_t ino;
/*
@@ -598,7 +599,7 @@ set_iocur_type(
* which contains the current disk location; daddr may change.
*/
ino = XFS_AGINO_TO_INO(mp, xfs_daddr_to_agno(mp, b),
- ((b << BBSHIFT) >> mp->m_sb.sb_inodelog) %
+ (((b << BBSHIFT) + bo) >> mp->m_sb.sb_inodelog) %
XFS_AGB_TO_AGINO(mp, mp->m_sb.sb_agblocks));
set_cur_inode(ino);
return;
--
2.20.1
next reply other threads:[~2020-08-13 6:03 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-13 6:03 Zorro Lang [this message]
2020-08-13 13:53 ` [PATCH] xfs_db: use correct inode to set inode type Gao Xiang
2020-08-13 15:29 ` Zorro Lang
2020-08-13 15:28 ` Gao Xiang
2020-08-13 17:37 ` Eric Sandeen
2020-08-13 14:56 ` Darrick J. Wong
2020-08-13 15:36 ` Zorro Lang
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=20200813060324.8159-1-zlang@redhat.com \
--to=zlang@redhat.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