Skip to content

Commit 0a6ed1b

Browse files
Martijn Coenenaxboe
authored andcommitted
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 <[email protected]> Reviewed-by: Christoph Hellwig <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
1 parent b0bd158 commit 0a6ed1b

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

drivers/block/loop.c

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -245,14 +245,6 @@ static void loop_set_size(struct loop_device *lo, loff_t size)
245245
set_capacity_revalidate_and_notify(lo->lo_disk, size, false);
246246
}
247247

248-
static void
249-
figure_loop_size(struct loop_device *lo, loff_t offset, loff_t sizelimit)
250-
{
251-
loff_t size = get_size(offset, sizelimit, lo->lo_backing_file);
252-
253-
loop_set_size(lo, size);
254-
}
255-
256248
static inline int
257249
lo_do_transfer(struct loop_device *lo, int cmd,
258250
struct page *rpage, unsigned roffs,
@@ -1534,10 +1526,13 @@ loop_get_status64(struct loop_device *lo, struct loop_info64 __user *arg) {
15341526

15351527
static int loop_set_capacity(struct loop_device *lo)
15361528
{
1529+
loff_t size;
1530+
15371531
if (unlikely(lo->lo_state != Lo_bound))
15381532
return -ENXIO;
15391533

1540-
figure_loop_size(lo, lo->lo_offset, lo->lo_sizelimit);
1534+
size = get_loop_size(lo, lo->lo_backing_file);
1535+
loop_set_size(lo, size);
15411536

15421537
return 0;
15431538
}

0 commit comments

Comments
 (0)