Commit 0a6ed1b5 authored by Martijn Coenen's avatar Martijn Coenen Committed by Jens Axboe

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: default avatarMartijn Coenen <maco@android.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent b0bd158d
...@@ -245,14 +245,6 @@ static void loop_set_size(struct loop_device *lo, loff_t size) ...@@ -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); 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 static inline int
lo_do_transfer(struct loop_device *lo, int cmd, lo_do_transfer(struct loop_device *lo, int cmd,
struct page *rpage, unsigned roffs, struct page *rpage, unsigned roffs,
...@@ -1534,10 +1526,13 @@ loop_get_status64(struct loop_device *lo, struct loop_info64 __user *arg) { ...@@ -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) static int loop_set_capacity(struct loop_device *lo)
{ {
loff_t size;
if (unlikely(lo->lo_state != Lo_bound)) if (unlikely(lo->lo_state != Lo_bound))
return -ENXIO; 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; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment