From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: sandeen@sandeen.net, darrick.wong@oracle.com
Cc: linux-xfs@vger.kernel.org
Subject: [PATCH 07/11] xfs_scrub: record disk LBA size
Date: Mon, 26 Aug 2019 14:30:37 -0700 [thread overview]
Message-ID: <156685503753.2841898.8227493950009379521.stgit@magnolia> (raw)
In-Reply-To: <156685499099.2841898.18430382226915450537.stgit@magnolia>
From: Darrick J. Wong <darrick.wong@oracle.com>
Remember the size (in bytes) of a logical block on the disk. We'll use
this in subsequent patches to improve the ability of media scans to
report on which files are corrupt.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
scrub/disk.c | 7 +++----
scrub/disk.h | 3 ++-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/scrub/disk.c b/scrub/disk.c
index dd109533..b728d1c7 100644
--- a/scrub/disk.c
+++ b/scrub/disk.c
@@ -193,7 +193,6 @@ disk_open(
#endif
struct disk *disk;
bool suspicious_disk = false;
- int lba_sz;
int error;
disk = calloc(1, sizeof(struct disk));
@@ -205,10 +204,10 @@ disk_open(
goto out_free;
/* Try to get LBA size. */
- error = ioctl(disk->d_fd, BLKSSZGET, &lba_sz);
+ error = ioctl(disk->d_fd, BLKSSZGET, &disk->d_lbasize);
if (error)
- lba_sz = 512;
- disk->d_lbalog = log2_roundup(lba_sz);
+ disk->d_lbasize = 512;
+ disk->d_lbalog = log2_roundup(disk->d_lbasize);
/* Obtain disk's stat info. */
error = fstat(disk->d_fd, &disk->d_sb);
diff --git a/scrub/disk.h b/scrub/disk.h
index 74a26d98..36bfb826 100644
--- a/scrub/disk.h
+++ b/scrub/disk.h
@@ -10,7 +10,8 @@
struct disk {
struct stat d_sb;
int d_fd;
- int d_lbalog;
+ unsigned int d_lbalog;
+ unsigned int d_lbasize; /* bytes */
unsigned int d_flags;
unsigned int d_blksize; /* bytes */
uint64_t d_size; /* bytes */
next prev parent reply other threads:[~2019-08-26 21:30 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-26 21:29 [PATCH 00/11] xfs_scrub: fix IO error detection during media verify Darrick J. Wong
2019-08-26 21:29 ` [PATCH 01/11] xfs_scrub: fix handling of read-verify pool runtime errors Darrick J. Wong
2019-08-26 21:30 ` [PATCH 02/11] xfs_scrub: abort all read verification work immediately on error Darrick J. Wong
2019-08-26 21:30 ` [PATCH 03/11] xfs_scrub: fix read-verify pool error communication problems Darrick J. Wong
2019-08-26 21:30 ` [PATCH 04/11] xfs_scrub: fix queue-and-stash of non-contiguous verify requests Darrick J. Wong
2019-08-26 21:30 ` [PATCH 05/11] xfs_scrub: only call read_verify_force_io once per pool Darrick J. Wong
2019-08-26 21:30 ` [PATCH 06/11] xfs_scrub: refactor inode prefix rendering code Darrick J. Wong
2019-08-26 21:30 ` Darrick J. Wong [this message]
2019-08-26 21:30 ` [PATCH 08/11] xfs_scrub: enforce read verify pool minimum io size Darrick J. Wong
2019-08-26 21:30 ` [PATCH 09/11] xfs_scrub: return bytes verified from a SCSI VERIFY command Darrick J. Wong
2019-08-26 21:30 ` [PATCH 10/11] xfs_scrub: fix read verify disk error handling strategy Darrick J. Wong
2019-08-26 21:31 ` [PATCH 11/11] xfs_scrub: simulate errors in the read-verify phase Darrick J. Wong
2019-09-06 3:37 [PATCH 00/11] xfs_scrub: fix IO error detection during media verify Darrick J. Wong
2019-09-06 3:38 ` [PATCH 07/11] xfs_scrub: record disk LBA size Darrick J. Wong
2019-09-25 21:34 [PATCH 00/11] xfs_scrub: fix IO error detection during media verify Darrick J. Wong
2019-09-25 21:35 ` [PATCH 07/11] xfs_scrub: record disk LBA size Darrick J. Wong
2019-10-17 1:35 ` Eric Sandeen
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=156685503753.2841898.8227493950009379521.stgit@magnolia \
--to=darrick.wong@oracle.com \
--cc=linux-xfs@vger.kernel.org \
--cc=sandeen@sandeen.net \
/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;
as well as URLs for NNTP newsgroup(s).