diff options
| author | Martijn Coenen <maco@android.com> | 2020-05-13 15:38:40 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2020-05-21 08:20:34 -0600 |
| commit | 0a6ed1b5ff6757f11ad2d57906ceb40488a5ee52 (patch) | |
| tree | a087586bd4bb9edf60ffa500111535caf58aa425 /drivers/block/loop.c | |
| parent | b0bd158dd630bd47640e0e418c062cda1e0da5ad (diff) | |
| download | linux-0a6ed1b5ff6757f11ad2d57906ceb40488a5ee52.tar.gz | |
loop: Remove figure_loop_size()
This function was now only used by loop_set_capacity(). Just open code
the remaining code in the caller instead.
Signed-off-by: Martijn Coenen <maco@android.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/block/loop.c')
| -rw-r--r-- | drivers/block/loop.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/block/loop.c b/drivers/block/loop.c index c134b34394837c..e281a9f03d9619 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -245,14 +245,6 @@ static void loop_set_size(struct loop_device *lo, loff_t size) set_capacity_revalidate_and_notify(lo->lo_disk, size, false); } -static void -figure_loop_size(struct loop_device *lo, loff_t offset, loff_t sizelimit) -{ - loff_t size = get_size(offset, sizelimit, lo->lo_backing_file); - - loop_set_size(lo, size); -} - static inline int lo_do_transfer(struct loop_device *lo, int cmd, struct page *rpage, unsigned roffs, @@ -1534,10 +1526,13 @@ loop_get_status64(struct loop_device *lo, struct loop_info64 __user *arg) { static int loop_set_capacity(struct loop_device *lo) { + loff_t size; + if (unlikely(lo->lo_state != Lo_bound)) return -ENXIO; - figure_loop_size(lo, lo->lo_offset, lo->lo_sizelimit); + size = get_loop_size(lo, lo->lo_backing_file); + loop_set_size(lo, size); return 0; } |