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 10:41:38 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge android11-5.4.57 (3f413d0) into msm-5.4

Browse source 
* refs/heads/tmp-3f413d0:
  Linux 5.4.57
  bpf: sockmap: Require attach_bpf_fd when detaching a program
  selftests: bpf: Fix detach from sockmap tests
  ext4: fix direct I/O read error
  arm64: Workaround circular dependency in pointer_auth.h
  random32: move the pseudo-random 32-bit definitions to prandom.h
  random32: remove net_rand_state from the latent entropy gcc plugin
  random: fix circular include dependency on arm64 after addition of percpu.h
  ARM: percpu.h: fix build error
  random32: update the net random state on interrupt and activity
  ANDROID: Update ABI xml
  UPSTREAM: of: property: Add device link support for pinctrl-0 through pinctrl-8
  UPSTREAM: of: property: Add device link support for multiple DT bindings
  UPSTREAM: of: property: Add device link support for extcon
  UPSTREAM: driver core: Change delimiter in devlink device's name to "--"
  UPSTREAM: driver core: Fix sleeping in invalid context during device link deletion
  BACKPORT: driver core: Add waiting_for_supplier sysfs file for devices
  UPSTREAM: driver core: Add state_synced sysfs file for devices that support it
  UPSTREAM: driver core: Expose device link details in sysfs
  UPSTREAM: driver core: Avoid deferred probe due to fw_devlink_pause/resume()
  UPSTREAM: driver core: Rename dev_links_info.defer_sync to defer_hook
  UPSTREAM: driver core: Don't do deferred probe in parallel with kernel_init thread
  UPSTREAM: arm64/module: Optimize module load time by optimizing PLT counting
  FROMGIT: scsi: block: pm: Simplify resume handling

Change-Id: Ide67c767b3a0f455ab5cec4b571ab599eae813d5
Signed-off-by: Blagovest Kolenichev <[email protected]>
This commit is contained in:
Blagovest Kolenichev 2020-08-10 02:29:46 -07:00
commit 33a0fb78c7
29 changed files with 7201 additions and 6239 deletions
Download patch file Download diff file Expand all files Collapse all files

5
fs/ext4/inode.c
View file

@ -3860,6 +3860,11 @@ static ssize_t ext4_direct_IO_read(struct kiocb *iocb, struct iov_iter *iter)
struct inode *inode = mapping->host;
size_t count = iov_iter_count(iter);
ssize_t ret;
loff_t offset = iocb->ki_pos;
loff_t size = i_size_read(inode);
if (offset >= size)
return 0;
/*
* Shared inode_lock is enough for us - it protects against concurrent