diff options
| author | Christoph Hellwig <hch@lst.de> | 2020-03-24 08:25:18 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2020-03-24 14:57:08 +0100 |
| commit | 1a9fba3a77a5b39d1c9e1611758303f2649474e9 (patch) | |
| tree | 1b42e5acf03d130d3a3277117aa21f6f9a017dbb /block/partitions | |
| parent | scsi: simplify scsi_partsize (diff) | |
| download | linux-1a9fba3a77a5b39d1c9e1611758303f2649474e9.tar.xz linux-1a9fba3a77a5b39d1c9e1611758303f2649474e9.zip | |
block: unexport read_dev_sector and put_dev_sector
read_dev_sector and put_dev_sector are now only used by the partition
parsing code. Remove the export for read_dev_sector and merge it into
the only caller. Clean the mess up a bit by using goto labels and
the SECTOR_SHIFT constant.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/partitions')
| -rw-r--r-- | block/partitions/check.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/block/partitions/check.h b/block/partitions/check.h index 6042f769471a..0fcf80117887 100644 --- a/block/partitions/check.h +++ b/block/partitions/check.h @@ -28,14 +28,14 @@ void free_partitions(struct parsed_partitions *state); struct parsed_partitions * check_partition(struct gendisk *, struct block_device *); -static inline void *read_part_sector(struct parsed_partitions *state, - sector_t n, Sector *p) +typedef struct { + struct page *v; +} Sector; + +void *read_part_sector(struct parsed_partitions *state, sector_t n, Sector *p); +static inline void put_dev_sector(Sector p) { - if (n >= get_capacity(state->bdev->bd_disk)) { - state->access_beyond_eod = true; - return NULL; - } - return read_dev_sector(state->bdev, n, p); + put_page(p.v); } static inline void |