A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-29 03:01:39 -04:00
Code Issues Projects Releases Packages Wiki Activity

UPSTREAM: loop: Remove figure_loop_size()

Browse source 
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]>
(cherry picked from commit 0a6ed1b5ff6757f11ad2d57906ceb40488a5ee52)
Bug: 148607611
Change-Id: Ib87a3f9fa260b2f1f84adbe4ae2151cfbf2e0fae
This commit is contained in:
Martijn Coenen 2020-05-13 15:38:40 +02:00
commit cf4c0b4164
1 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
drivers/block/loop.c
View file

@ -246,14 +246,6 @@ static void loop_set_size(struct loop_device *lo, loff_t size)
kobject_uevent(&disk_to_dev(bdev->bd_disk)->kobj, KOBJ_CHANGE);
}
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,
@ -1532,10 +1524,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;
}