From: Christoph Hellwig <hch@lst.de>
To: Jens Axboe <axboe@kernel.dk>
Cc: Coly Li <colyli@suse.de>, Mike Snitzer <snitzer@redhat.com>,
Song Liu <song@kernel.org>, David Sterba <dsterba@suse.com>,
Josef Bacik <josef@toxicpanda.com>,
"Theodore Ts'o" <tytso@mit.edu>,
OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>,
Dave Kleikamp <shaggy@kernel.org>,
Ryusuke Konishi <konishi.ryusuke@gmail.com>,
Anton Altaparmakov <anton@tuxera.com>,
Konstantin Komarov <almaz.alexandrovich@paragon-software.com>,
Kees Cook <keescook@chromium.org>,
Phillip Lougher <phillip@squashfs.org.uk>,
Jan Kara <jack@suse.com>,
linux-block@vger.kernel.org, dm-devel@redhat.com,
drbd-dev@lists.linbit.com, linux-bcache@vger.kernel.org,
linux-raid@vger.kernel.org, linux-mtd@lists.infradead.org,
linux-nvme@lists.infradead.org, linux-scsi@vger.kernel.org,
target-devel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-btrfs@vger.kernel.org, linux-ext4@vger.kernel.org,
jfs-discussion@lists.sourceforge.net, linux-nfs@vger.kernel.org,
linux-nilfs@vger.kernel.org,
linux-ntfs-dev@lists.sourceforge.net, ntfs3@lists.linux.dev,
reiserfs-devel@vger.kernel.org
Subject: [PATCH 04/29] md: use bdev_nr_sectors instead of open coding it
Date: Wed, 13 Oct 2021 07:10:17 +0200 [thread overview]
Message-ID: <20211013051042.1065752-5-hch@lst.de> (raw)
In-Reply-To: <20211013051042.1065752-1-hch@lst.de>
Use the proper helper to read the block device size.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
drivers/md/md.c | 26 +++++++++++---------------
1 file changed, 11 insertions(+), 15 deletions(-)
diff --git a/drivers/md/md.c b/drivers/md/md.c
index ec09083ff0eff..9b4f4bf349120 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -890,8 +890,7 @@ static struct md_personality *find_pers(int level, char *clevel)
/* return the offset of the super block in 512byte sectors */
static inline sector_t calc_dev_sboffset(struct md_rdev *rdev)
{
- sector_t num_sectors = i_size_read(rdev->bdev->bd_inode) / 512;
- return MD_NEW_SIZE_SECTORS(num_sectors);
+ return MD_NEW_SIZE_SECTORS(bdev_nr_sectors(rdev->bdev));
}
static int alloc_disk_sb(struct md_rdev *rdev)
@@ -1633,8 +1632,7 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_
*/
switch(minor_version) {
case 0:
- sb_start = i_size_read(rdev->bdev->bd_inode) >> 9;
- sb_start -= 8*2;
+ sb_start = bdev_nr_sectors(rdev->bdev) - 8 * 2;
sb_start &= ~(sector_t)(4*2-1);
break;
case 1:
@@ -1789,10 +1787,9 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_
else
ret = 0;
}
- if (minor_version) {
- sectors = (i_size_read(rdev->bdev->bd_inode) >> 9);
- sectors -= rdev->data_offset;
- } else
+ if (minor_version)
+ sectors = bdev_nr_sectors(rdev->bdev) - rdev->data_offset;
+ else
sectors = rdev->sb_start;
if (sectors < le64_to_cpu(sb->data_size))
return -EINVAL;
@@ -2170,8 +2167,7 @@ super_1_rdev_size_change(struct md_rdev *rdev, sector_t num_sectors)
return 0; /* too confusing */
if (rdev->sb_start < rdev->data_offset) {
/* minor versions 1 and 2; superblock before data */
- max_sectors = i_size_read(rdev->bdev->bd_inode) >> 9;
- max_sectors -= rdev->data_offset;
+ max_sectors = bdev_nr_sectors(rdev->bdev) - rdev->data_offset;
if (!num_sectors || num_sectors > max_sectors)
num_sectors = max_sectors;
} else if (rdev->mddev->bitmap_info.offset) {
@@ -2180,7 +2176,7 @@ super_1_rdev_size_change(struct md_rdev *rdev, sector_t num_sectors)
} else {
/* minor version 0; superblock after data */
sector_t sb_start, bm_space;
- sector_t dev_size = i_size_read(rdev->bdev->bd_inode) >> 9;
+ sector_t dev_size = bdev_nr_sectors(rdev->bdev);
/* 8K is for superblock */
sb_start = dev_size - 8*2;
@@ -3384,7 +3380,7 @@ rdev_size_store(struct md_rdev *rdev, const char *buf, size_t len)
if (!sectors)
return -EBUSY;
} else if (!sectors)
- sectors = (i_size_read(rdev->bdev->bd_inode) >> 9) -
+ sectors = bdev_nr_sectors(rdev->bdev) -
rdev->data_offset;
if (!my_mddev->pers->resize)
/* Cannot change size for RAID0 or Linear etc */
@@ -3711,7 +3707,7 @@ static struct md_rdev *md_import_device(dev_t newdev, int super_format, int supe
kobject_init(&rdev->kobj, &rdev_ktype);
- size = i_size_read(rdev->bdev->bd_inode) >> BLOCK_SIZE_BITS;
+ size = (bdev_nr_sectors(rdev->bdev) << SECTOR_SHIFT) >> BLOCK_SIZE_BITS;
if (!size) {
pr_warn("md: %s has zero or unknown size, marking faulty!\n",
bdevname(rdev->bdev,b));
@@ -6882,7 +6878,7 @@ int md_add_new_disk(struct mddev *mddev, struct mdu_disk_info_s *info)
if (!mddev->persistent) {
pr_debug("md: nonpersistent superblock ...\n");
- rdev->sb_start = i_size_read(rdev->bdev->bd_inode) / 512;
+ rdev->sb_start = bdev_nr_sectors(rdev->bdev);
} else
rdev->sb_start = calc_dev_sboffset(rdev);
rdev->sectors = rdev->sb_start;
@@ -6969,7 +6965,7 @@ static int hot_add_disk(struct mddev *mddev, dev_t dev)
if (mddev->persistent)
rdev->sb_start = calc_dev_sboffset(rdev);
else
- rdev->sb_start = i_size_read(rdev->bdev->bd_inode) / 512;
+ rdev->sb_start = bdev_nr_sectors(rdev->bdev);
rdev->sectors = rdev->sb_start;
--
2.30.2
next prev parent reply other threads:[~2021-10-13 5:17 UTC|newest]
Thread overview: 76+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-13 5:10 don't use ->bd_inode to access the block device size Christoph Hellwig
2021-10-13 5:10 ` [PATCH 01/29] bcache: remove bdev_sectors Christoph Hellwig
2021-10-13 5:21 ` Coly Li
2021-10-13 6:09 ` Kees Cook
2021-10-13 5:10 ` [PATCH 02/29] drbd: use bdev_nr_sectors instead of open coding it Christoph Hellwig
2021-10-13 6:09 ` Kees Cook
2021-10-13 22:33 ` Chaitanya Kulkarni
2021-10-13 5:10 ` [PATCH 03/29] dm: " Christoph Hellwig
2021-10-13 6:10 ` Kees Cook
2021-10-13 16:43 ` Mike Snitzer
2021-10-13 5:10 ` Christoph Hellwig [this message]
2021-10-13 6:12 ` [PATCH 04/29] md: " Kees Cook
2021-10-13 21:14 ` Song Liu
2021-10-13 5:10 ` [PATCH 05/29] mtd/block2mtd: " Christoph Hellwig
2021-10-13 5:10 ` [PATCH 06/29] nvmet: " Christoph Hellwig
2021-10-13 22:33 ` Chaitanya Kulkarni
2021-10-13 5:10 ` [PATCH 07/29] target/iblock: " Christoph Hellwig
2021-10-13 9:31 ` Bodo Stroesser
2021-10-13 22:37 ` Chaitanya Kulkarni
2021-10-13 5:10 ` [PATCH 08/29] fs: use bdev_nr_sectors instead of open coding it in blkdev_max_block Christoph Hellwig
2021-10-13 10:42 ` Jan Kara
2021-10-13 22:35 ` Chaitanya Kulkarni
2021-10-13 5:10 ` [PATCH 09/29] fs: simplify init_page_buffers Christoph Hellwig
2021-10-13 6:14 ` Kees Cook
2021-10-13 10:42 ` Jan Kara
2021-10-13 5:10 ` [PATCH 10/29] affs: use bdev_nr_sectors instead of open coding it Christoph Hellwig
2021-10-13 6:14 ` Kees Cook
2021-10-13 5:10 ` [PATCH 11/29] btrfs: " Christoph Hellwig
2021-10-13 7:08 ` Anand Jain
2021-10-13 22:36 ` Chaitanya Kulkarni
2021-10-14 2:44 ` Keith Busch
2021-10-13 5:10 ` [PATCH 12/29] cramfs: " Christoph Hellwig
2021-10-13 6:16 ` Kees Cook
2021-10-13 5:10 ` [PATCH 13/29] fat: " Christoph Hellwig
2021-10-13 6:16 ` Kees Cook
2021-10-13 5:10 ` [PATCH 14/29] hfs: " Christoph Hellwig
2021-10-13 6:16 ` Kees Cook
2021-10-13 5:10 ` [PATCH 15/29] hfsplus: " Christoph Hellwig
2021-10-13 6:16 ` Kees Cook
2021-10-13 5:10 ` [PATCH 16/29] jfs: " Christoph Hellwig
2021-10-13 14:13 ` Dave Kleikamp
2021-10-13 5:10 ` [PATCH 17/29] nfs/blocklayout: " Christoph Hellwig
2021-10-13 5:10 ` [PATCH 18/29] nilfs2: " Christoph Hellwig
2021-10-13 5:10 ` [PATCH 19/29] ntfs3: " Christoph Hellwig
2021-10-13 5:10 ` [PATCH 20/29] pstore/blk: " Christoph Hellwig
2021-10-13 5:10 ` [PATCH 21/29] reiserfs: " Christoph Hellwig
2021-10-13 10:43 ` Jan Kara
2021-10-13 5:10 ` [PATCH 22/29] squashfs: " Christoph Hellwig
2021-10-13 19:37 ` Phillip Lougher
2021-10-13 5:10 ` [PATCH 23/29] block: use bdev_nr_sectors instead of open coding it in blkdev_fallocate Christoph Hellwig
2021-10-13 10:44 ` Jan Kara
2021-10-13 22:34 ` Chaitanya Kulkarni
2021-10-13 5:10 ` [PATCH 24/29] block: add a sb_bdev_nr_blocks helper Christoph Hellwig
2021-10-13 6:27 ` Kees Cook
2021-10-13 5:10 ` [PATCH 25/29] ext4: use sb_bdev_nr_blocks Christoph Hellwig
2021-10-13 6:29 ` Kees Cook
2021-10-13 6:30 ` Kees Cook
2021-10-13 10:46 ` Jan Kara
2021-10-13 15:51 ` Theodore Ts'o
2021-10-13 5:10 ` [PATCH 26/29] jfs: " Christoph Hellwig
2021-10-13 6:31 ` Kees Cook
2021-10-13 5:10 ` [PATCH 27/29] ntfs: " Christoph Hellwig
2021-10-13 6:33 ` Kees Cook
2021-10-13 5:10 ` [PATCH 28/29] reiserfs: " Christoph Hellwig
2021-10-13 6:33 ` Kees Cook
2021-10-13 10:46 ` Jan Kara
2021-10-13 5:10 ` [PATCH 29/29] udf: " Christoph Hellwig
2021-10-13 6:34 ` Kees Cook
2021-10-13 10:47 ` Jan Kara
2021-10-13 6:39 ` don't use ->bd_inode to access the block device size Kees Cook
2021-10-13 7:14 ` Anand Jain
2021-10-14 6:28 ` Christoph Hellwig
2021-10-14 9:32 ` Anton Altaparmakov
2021-10-14 13:13 ` Dave Kleikamp
2021-10-14 15:14 ` Kees Cook
2021-10-14 15:35 ` Wol
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=20211013051042.1065752-5-hch@lst.de \
--to=hch@lst.de \
--cc=almaz.alexandrovich@paragon-software.com \
--cc=anton@tuxera.com \
--cc=axboe@kernel.dk \
--cc=colyli@suse.de \
--cc=dm-devel@redhat.com \
--cc=drbd-dev@lists.linbit.com \
--cc=dsterba@suse.com \
--cc=hirofumi@mail.parknet.co.jp \
--cc=jack@suse.com \
--cc=jfs-discussion@lists.sourceforge.net \
--cc=josef@toxicpanda.com \
--cc=keescook@chromium.org \
--cc=konishi.ryusuke@gmail.com \
--cc=linux-bcache@vger.kernel.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=linux-nfs@vger.kernel.org \
--cc=linux-nilfs@vger.kernel.org \
--cc=linux-ntfs-dev@lists.sourceforge.net \
--cc=linux-nvme@lists.infradead.org \
--cc=linux-raid@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=ntfs3@lists.linux.dev \
--cc=phillip@squashfs.org.uk \
--cc=reiserfs-devel@vger.kernel.org \
--cc=shaggy@kernel.org \
--cc=snitzer@redhat.com \
--cc=song@kernel.org \
--cc=target-devel@vger.kernel.org \
--cc=tytso@mit.edu \
/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).