mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 10:41:38 -04:00
Merge remote-tracking branch 'sm8350/lineage-20' into lineage-23.2
* sm8350/lineage-20: (148 commits)
ANDROID: Add FUSE_BPF to gki_defconfig
Reapply "UPSTREAM: seccomp: Remove bogus __user annotations"
ANDROID: fuse: Open-code vma_set_file() logic in fuse_backing_mmap()
BACKPORT: fuse: fix livelock in synchronous file put from fuseblk workers
BACKPORT: compat_ioctl: move more drivers to compat_ptr_ioctl
UPSTREAM: fuse: make sure reclaim doesn't write the inode
UPSTREAM: ANDROID: fuse-bpf: Correct fuse bpf feature flag
UPSTREAM: fuse: verify {g,u}id mount options correctly
fixup! BACKPORT: fuse: name fs_context consistently
BACKPORT: fuse: name fs_context consistently
UPSTREAM: fuse: fix root lookup with nonzero generation
UPSTREAM: ANDROID: fuse-bpf: Fix the issue of abnormal lseek system calls
UPSTREAM: ANDROID: fuse-bpf: Follow mounts in lookups
UPSTREAM: fuse: dax: set fc->dax to NULL in fuse_dax_conn_free()
BACKPORT: ANDROID: fuse-bpf: Ignore readaheads unless they go to the daemon
UPSTREAM: ANDROID: fuse-bpf: Add NULL pointer check in fuse_release_in
UPSTREAM: ANDROID: fs/passthrough: Fix compatibility with R/O file system
UPSTREAM: ANDROID: fuse-bpf: Add NULL pointer check in fuse_entry_revalidate
UPSTREAM: ANDROID: fuse-bpf: Get correct inode in mkdir
UPSTREAM: ANDROID: fuse-bpf: Use stored bpf for create_open
...
Change-Id: Ice6b8c09d19db311c827d0a9f48d46795be998ee
This commit is contained in:
commit
e14e0696e2
81 changed files with 7762 additions and 1069 deletions
|
|
@ -790,7 +790,7 @@ static const struct file_operations wdm_fops = {
|
|||
.release = wdm_release,
|
||||
.poll = wdm_poll,
|
||||
.unlocked_ioctl = wdm_ioctl,
|
||||
.compat_ioctl = wdm_ioctl,
|
||||
.compat_ioctl = compat_ptr_ioctl,
|
||||
.llseek = noop_llseek,
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2241,9 +2241,7 @@ static const struct file_operations fops = {
|
|||
.release = usbtmc_release,
|
||||
.flush = usbtmc_flush,
|
||||
.unlocked_ioctl = usbtmc_ioctl,
|
||||
#ifdef CONFIG_COMPAT
|
||||
.compat_ioctl = usbtmc_ioctl,
|
||||
#endif
|
||||
.compat_ioctl = compat_ptr_ioctl,
|
||||
.fasync = usbtmc_fasync,
|
||||
.poll = usbtmc_poll,
|
||||
.llseek = default_llseek,
|
||||
|
|
|
|||
Loading…
Reference in a new issue