Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse
Pull fuse updates from Miklos Szeredi: "The biggest part of this pull request is a patch series from Maxim Patlasov to optimize scatter-gather direct IO. There's also the addition of a "readdirplus" API, poll events and various fixes and cleanups. There's a one line change outside of fuse to mm/filemap.c which makes the argument of iov_iter_single_seg_count() const, required by Maxim's patches." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse: (22 commits) fuse: allow control of adaptive readdirplus use Synchronize fuse header with one used in library fuse: send poll events fuse: don't WARN when nlink is zero fuse: avoid out-of-scope stack access fuse: bump version for READDIRPLUS FUSE: Adapt readdirplus to application usage patterns Do not use RCU for current process credentials fuse: cleanup fuse_direct_io() fuse: optimize __fuse_direct_io() fuse: optimize fuse_get_user_pages() fuse: pass iov[] to fuse_get_user_pages() mm: minor cleanup of iov_iter_single_seg_count() fuse: use req->page_descs[] for argpages cases fuse: add per-page descriptor <offset, length> to fuse_req fuse: rework fuse_do_ioctl() fuse: rework fuse_perform_write() fuse: rework fuse_readpages() fuse: rework fuse_retrieve() fuse: categorize fuse_get_req() ...
Showing
- fs/fuse/cuse.c 7 additions, 3 deletionsfs/fuse/cuse.c
- fs/fuse/dev.c 96 additions, 32 deletionsfs/fuse/dev.c
- fs/fuse/dir.c 221 additions, 38 deletionsfs/fuse/dir.c
- fs/fuse/file.c 154 additions, 84 deletionsfs/fuse/file.c
- fs/fuse/fuse_i.h 61 additions, 13 deletionsfs/fuse/fuse_i.h
- fs/fuse/inode.c 11 additions, 5 deletionsfs/fuse/inode.c
- include/linux/fs.h 1 addition, 1 deletioninclude/linux/fs.h
- include/uapi/linux/fuse.h 57 additions, 3 deletionsinclude/uapi/linux/fuse.h
- mm/filemap.c 1 addition, 1 deletionmm/filemap.c
Loading
Please register or sign in to comment