[PATCH v4 05/10] loop: Remove figure_loop_size()

[Martijn Coenen]

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 <m...@android.com>
---
 drivers/block/loop.c | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 9f5913879921..32755e874326 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -258,21 +258,6 @@ static void loop_set_size(struct loop_device *lo, loff_t 
size)
        set_capacity_revalidate_and_notify(lo->lo_disk, size, false);
 }
 
-static int
-figure_loop_size(struct loop_device *lo, loff_t offset, loff_t sizelimit)
-{
-       int err;
-       loff_t size = get_size(offset, sizelimit, lo->lo_backing_file);
-
-       err = loop_validate_size(size);
-       if (err)
-               return err;
-
-       loop_set_size(lo, size);
-
-       return 0;
-}
-
 static inline int
 lo_do_transfer(struct loop_device *lo, int cmd,
               struct page *rpage, unsigned roffs,
@@ -1560,10 +1545,21 @@ loop_get_status64(struct loop_device *lo, struct 
loop_info64 __user *arg) {
 
 static int loop_set_capacity(struct loop_device *lo)
 {
+       int err;
+       loff_t size;
+
        if (unlikely(lo->lo_state != Lo_bound))
                return -ENXIO;
 
-       return figure_loop_size(lo, lo->lo_offset, lo->lo_sizelimit);
+       size = get_loop_size(lo, lo->lo_backing_file);
+
+       err = loop_validate_size(size);
+       if (err)
+               return err;
+
+       loop_set_size(lo, size);
+
+       return 0;
 }
 
 static int loop_set_dio(struct loop_device *lo, unsigned long arg)
-- 
2.26.2.303.gf8c07b1a785-goog