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>

diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index c134b34394837c36703a78d309c5458e7e7e301e..e281a9f03d96195168175a703e1bd91139afc35e 100644 (file)
--- 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;
 }