From: Nathan Scott <nathans@sgi.com>
To: xfs@oss.sgi.com
Subject: review: fix bulkstat error detection logic
Date: Wed, 26 Jul 2006 10:24:06 +1000 [thread overview]
Message-ID: <20060726102406.I2118045@wobbly.melbourne.sgi.com> (raw)
Hi,
An earlier patch to remove bulkstat verbosity in debug kernels
changed the xfs_itobp logic slightly, such that we no longer do
the first stage of buffer checking there. Turns out this isn't
the right fix, we need to do that check still, and pass out the
error code to bulkstat still, otherwise we either trip up logic
in later debug code, or pass out success incorrectly.
This fixes that up, and is the last bulkstat change I have for
awhile. :) Its error handling is correct once more, its a fair
bit quicker, and no more debug-kernel console spam - hooray!
cheers.
--
Nathan
Index: xfs-linux/xfs_inode.c
===================================================================
--- xfs-linux.orig/xfs_inode.c 2006-07-25 12:02:05.787585750 +1000
+++ xfs-linux/xfs_inode.c 2006-07-25 13:04:58.941286750 +1000
@@ -335,10 +335,9 @@ xfs_itobp(
#if !defined(__KERNEL__)
ni = 0;
#elif defined(DEBUG)
- ni = (imap_flags & XFS_IMAP_BULKSTAT) ? 0 :
- (BBTOB(imap.im_len) >> mp->m_sb.sb_inodelog);
+ ni = BBTOB(imap.im_len) >> mp->m_sb.sb_inodelog;
#else /* usual case */
- ni = (imap_flags & XFS_IMAP_BULKSTAT) ? 0 : 1;
+ ni = 1;
#endif
for (i = 0; i < ni; i++) {
@@ -349,11 +348,15 @@ xfs_itobp(
(i << mp->m_sb.sb_inodelog));
di_ok = INT_GET(dip->di_core.di_magic, ARCH_CONVERT) == XFS_DINODE_MAGIC &&
XFS_DINODE_GOOD_VERSION(INT_GET(dip->di_core.di_version, ARCH_CONVERT));
- if (unlikely(XFS_TEST_ERROR(!di_ok, mp, XFS_ERRTAG_ITOBP_INOTOBP,
- XFS_RANDOM_ITOBP_INOTOBP))) {
+ if (unlikely(XFS_TEST_ERROR(!di_ok, mp,
+ XFS_ERRTAG_ITOBP_INOTOBP,
+ XFS_RANDOM_ITOBP_INOTOBP))) {
+ if (imap_flags & XFS_IMAP_BULKSTAT) {
+ xfs_trans_brelse(tp, bp);
+ return XFS_ERROR(EINVAL);
+ }
#ifdef DEBUG
- if (!(imap_flags & XFS_IMAP_BULKSTAT))
- cmn_err(CE_ALERT,
+ cmn_err(CE_ALERT,
"Device %s - bad inode magic/vsn "
"daddr %lld #%d (magic=%x)",
XFS_BUFTARG_NAME(mp->m_ddev_targp),
next reply other threads:[~2006-07-26 0:25 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-07-26 0:24 Nathan Scott [this message]
2006-07-28 5:40 ` review: fix bulkstat error detection logic Timothy Shimmin
2006-07-28 5:45 ` Nathan Scott
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=20060726102406.I2118045@wobbly.melbourne.sgi.com \
--to=nathans@sgi.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