diff options
| author |   Christoph Hellwig <hch@lst.de> | 2020-11-26 18:43:37 +0100 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2020-12-01 14:53:40 -0700 |
| commit | a782483cc1f875355690625d8253a232f2581418 (patch) | |
| tree | 492d3bf67cdd2535afd826dde93aa35dcfb42180 /block/bio.c | |
| parent | block: initialize struct block_device in bdev_alloc (diff) | |
| download | linux-dev-a782483cc1f875355690625d8253a232f2581418.tar.xz linux-dev-a782483cc1f875355690625d8253a232f2581418.zip | |
block: remove the nr_sects field in struct hd_struct
Now that the hd_struct always has a block device attached to it, there is
no need for having two size field that just get out of sync.
Additionally the field in hd_struct did not use proper serialization,
possibly allowing for torn writes. By only using the block_device field
this problem also gets fixed.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: Jan Kara <jack@suse.cz>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Acked-by: Coly Li <colyli@suse.de> [bcache]
Acked-by: Chao Yu <yuchao0@huawei.com> [f2fs]
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/bio.c')
| -rw-r--r-- | block/bio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/block/bio.c b/block/bio.c index fa01bef35bb1..669bb47a3198 100644 --- a/block/bio.c +++ b/block/bio.c @@ -613,8 +613,8 @@ void guard_bio_eod(struct bio *bio) rcu_read_lock(); part = __disk_get_part(bio->bi_disk, bio->bi_partno); if (part) - maxsector = part_nr_sects_read(part); - else + maxsector = bdev_nr_sectors(part->bdev); + else maxsector = get_capacity(bio->bi_disk); rcu_read_unlock(); |