History

Merge tag 'fuse-update-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse

Pull fuse updates from Miklos Szeredi: - Fixes for virtiofs submounts - Misc fixes and cleanups * tag 'fuse-update-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse: virtiofs: Fix spelling mistakes fuse: use DIV_ROUND_UP helper macro for calculations fuse: fix illegal access to inode with reused nodeid fuse: allow fallocate(FALLOC_FL_ZERO_RANGE) fuse: Make fuse_fill_super_submount() static fuse: Switch to fc_mount() for submounts fuse: Call vfs_get_tree() for submounts fuse: add dedicated filesystem context ops for submounts virtiofs: propagate sync() to file server fuse: reject internal errno fuse: check connected before queueing on fpq->io fuse: ignore PG_workingset after stealing fuse: Fix infinite loop in sget_fc() fuse: Fix crash if superblock of submount gets killed early fuse: Fix crash in fuse_dentry_automount() error path

Linus Torvalds committed 5 years ago

Commit 8e4f3e12 parents 729437e c4e0cd49 files · +161 −81Browse files

Showing the changes to include/uapi/linux (1 of 9 files). Show all

Unified · Split

include/uapi/linux/fuse.h+9−1
@@ -181,6 +181,9 @@ · 180 unmodified lines
181 * - add FUSE_OPEN_KILL_SUIDGID181 * - add FUSE_OPEN_KILL_SUIDGID
182 * - extend fuse_setxattr_in, add FUSE_SETXATTR_EXT182 * - extend fuse_setxattr_in, add FUSE_SETXATTR_EXT
183 * - add FUSE_SETXATTR_ACL_KILL_SGID183 * - add FUSE_SETXATTR_ACL_KILL_SGID
184 *
185 * 7.34
186 * - add FUSE_SYNCFS
184 */187 */
185 188
186#ifndef _LINUX_FUSE_H189#ifndef _LINUX_FUSE_H
@@ -216,7 +219,7 @@ · 29 unmodified lines
216#define FUSE_KERNEL_VERSION 7219#define FUSE_KERNEL_VERSION 7
217 220
218/** Minor version number of this interface */221/** Minor version number of this interface */
219#define FUSE_KERNEL_MINOR_VERSION 33222#define FUSE_KERNEL_MINOR_VERSION 34
220 223
221/** The node ID of the root inode */224/** The node ID of the root inode */
222#define FUSE_ROOT_ID 1225#define FUSE_ROOT_ID 1
@@ -509,6 +512,7 @@ enum fuse_opcode { · 286 unmodified lines
509 FUSE_COPY_FILE_RANGE = 47,512 FUSE_COPY_FILE_RANGE = 47,
510 FUSE_SETUPMAPPING = 48,513 FUSE_SETUPMAPPING = 48,
511 FUSE_REMOVEMAPPING = 49,514 FUSE_REMOVEMAPPING = 49,
515 FUSE_SYNCFS = 50,
512 516
513 /* CUSE specific operations */517 /* CUSE specific operations */
514 CUSE_INIT = 4096,518 CUSE_INIT = 4096,
@@ -971,4 +975,8 @@ struct fuse_removemapping_one { · 456 unmodified lines
971#define FUSE_REMOVEMAPPING_MAX_ENTRY \975#define FUSE_REMOVEMAPPING_MAX_ENTRY \
972 (PAGE_SIZE / sizeof(struct fuse_removemapping_one))976 (PAGE_SIZE / sizeof(struct fuse_removemapping_one))
973 977
978struct fuse_syncfs_in {
979 uint64_t padding;
980};
981
974#endif /* _LINUX_FUSE_H */982#endif /* _LINUX_FUSE_H */