Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse
Pull fuse fixes from Miklos Szeredi:
"These two pathes fix issues with the kernel-userspace protocol changes
in v3.15"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
fuse: add FUSE_NO_OPEN_SUPPORT flag to INIT
fuse: s_time_gran fix
+4
-4
+1
-4
fs/fuse/inode.c
+1
-4
fs/fuse/inode.c
···
907
907
fc->writeback_cache = 1;
908
908
if (arg->time_gran && arg->time_gran <= 1000000000)
909
909
fc->sb->s_time_gran = arg->time_gran;
910
-
else
911
-
fc->sb->s_time_gran = 1000000000;
912
-
913
910
} else {
914
911
ra_pages = fc->max_read / PAGE_CACHE_SIZE;
915
912
fc->no_lock = 1;
···
935
938
FUSE_SPLICE_WRITE | FUSE_SPLICE_MOVE | FUSE_SPLICE_READ |
936
939
FUSE_FLOCK_LOCKS | FUSE_IOCTL_DIR | FUSE_AUTO_INVAL_DATA |
937
940
FUSE_DO_READDIRPLUS | FUSE_READDIRPLUS_AUTO | FUSE_ASYNC_DIO |
938
-
FUSE_WRITEBACK_CACHE;
941
+
FUSE_WRITEBACK_CACHE | FUSE_NO_OPEN_SUPPORT;
939
942
req->in.h.opcode = FUSE_INIT;
940
943
req->in.numargs = 1;
941
944
req->in.args[0].size = sizeof(*arg);
+3
include/uapi/linux/fuse.h
+3
include/uapi/linux/fuse.h
···
101
101
* - add FATTR_CTIME
102
102
* - add ctime and ctimensec to fuse_setattr_in
103
103
* - add FUSE_RENAME2 request
104
+
* - add FUSE_NO_OPEN_SUPPORT flag
104
105
*/
105
106
106
107
#ifndef _LINUX_FUSE_H
···
230
229
* FUSE_READDIRPLUS_AUTO: adaptive readdirplus
231
230
* FUSE_ASYNC_DIO: asynchronous direct I/O submission
232
231
* FUSE_WRITEBACK_CACHE: use writeback cache for buffered writes
232
+
* FUSE_NO_OPEN_SUPPORT: kernel supports zero-message opens
233
233
*/
234
234
#define FUSE_ASYNC_READ (1 << 0)
235
235
#define FUSE_POSIX_LOCKS (1 << 1)
···
249
247
#define FUSE_READDIRPLUS_AUTO (1 << 14)
250
248
#define FUSE_ASYNC_DIO (1 << 15)
251
249
#define FUSE_WRITEBACK_CACHE (1 << 16)
250
+
#define FUSE_NO_OPEN_SUPPORT (1 << 17)
252
251
253
252
/**
254
253
* CUSE INIT request/reply flags