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-28 18:51:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'android11-5.4' into 'android11-5.4-lts'

Browse source 
Sync up with android11-5.4 for the following commits:

05cd3c592d ANDROID: distribute Module.symvers
6eea8a6d1d UPSTREAM: usb: max-3421: Prevent corruption of freed memory
f625f1b305 ANDROID: ABI: Update allowed list for QCOM
d7aa701af5 UPSTREAM: driver core: Prevent warning when removing a device link from unregistered consumer
2e30052a73 UPSTREAM: udp: properly flush normal packet at GRO time
833c1e231c UPSTREAM: net/xfrm/compat: Copy xfrm_spdattr_type_t atributes
a95d35ae26 UPSTREAM: f2fs: Advertise encrypted casefolding in sysfs
8557d5a891 UPSTREAM: loop: Fix missing discard support when using LOOP_CONFIGURE
d0cca8a1ea UPSTREAM: thermal/drivers/sprd: Add missing MODULE_DEVICE_TABLE
ba83fe23f6 UPSTREAM: nvmem: sprd: Fix an error message
98e9d16b6b UPSTREAM: usb: musb: Fix an error message
ace71bcb51 UPSTREAM: scsi: ufs: core: Cancel rpm_dev_flush_recheck_work during system suspend
dc5ccc2d9c UPSTREAM: scsi: ufs: core: Do not put UFS power into LPM if link is broken
5576e5e477 UPSTREAM: selinux: add proper NULL termination to the secclass_map permissions
f87a97cd71 UPSTREAM: of: property: fw_devlink: do not link ".*,nr-gpios"
751aaf9f30 UPSTREAM: udp: never accept GSO_FRAGLIST packets
01228292a6 UPSTREAM: udp: skip L4 aggregation for UDP tunnel packets
13ab504be3 UPSTREAM: xfrm/compat: Cleanup WARN()s that can be user-triggered
236d41699d UPSTREAM: pinctrl: sunxi: fix irq bank map for the Allwinner A100 pin controller
4f031c8941 UPSTREAM: loop: Set correct device size when using LOOP_CONFIGURE
38866fe5a7 UPSTREAM: loop: unset GENHD_FL_NO_PART_SCAN on LOOP_CONFIGURE
c060961254 ANDROID: ion_system_heap: Add __GFP_NOWARN to mid-order allocations
77e911a101 ANDROID: drivers: gpu: drm: increase the MAX_DRM_OPEN_COUNT
0923d5c13b UPSTREAM: af_unix: fix garbage collect vs MSG_PEEK

Change-Id: I91712c50821a00aea9165ca5497cead9ade766e6
Signed-off-by: Greg Kroah-Hartman <[email protected]>
This commit is contained in:
Greg Kroah-Hartman 2021-10-14 09:25:00 +02:00
commit 65d414cb38
19 changed files with 132 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

7
drivers/block/loop.c
View file

@ -1113,8 +1113,6 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
mapping = file->f_mapping;
inode = mapping->host;
size = get_loop_size(lo, file);
if ((config->info.lo_flags & ~LOOP_CONFIGURE_SETTABLE_FLAGS) != 0) {
error = -EINVAL;
goto out_unlock;
@ -1163,9 +1161,12 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
blk_queue_physical_block_size(lo->lo_queue, bsize);
blk_queue_io_min(lo->lo_queue, bsize);
loop_config_discard(lo);
loop_update_rotational(lo);
loop_update_dio(lo);
loop_sysfs_init(lo);
size = get_loop_size(lo, file);
loop_set_size(lo, size);
set_blocksize(bdev, S_ISBLK(inode->i_mode) ?
@ -1175,6 +1176,8 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
if (part_shift)
lo->lo_flags |= LO_FLAGS_PARTSCAN;
partscan = lo->lo_flags & LO_FLAGS_PARTSCAN;
if (partscan)
lo->lo_disk->flags &= ~GENHD_FL_NO_PART_SCAN;
/* Grab the block_device to prevent its destruction after we
* put /dev/loopXX inode. Later in __loop_clr_fd() we bdput(bdev).