summaryrefslogtreecommitdiffstats
path: root/fs/fuse/fuse_i.h
diff options
context:
space:
mode:
authorMiklos Szeredi <mszeredi@redhat.com>2016-10-01 07:32:32 +0200
committerMiklos Szeredi <mszeredi@redhat.com>2016-10-01 07:32:32 +0200
commit29433a2991fa636c1fcd5bf5893cf92c37e0b26c (patch)
treed70fc6a8b489570936c1e34cd33a594025e267df /fs/fuse/fuse_i.h
parentbcb6f6d2b9c299db32b20f4357c36a101e7f0293 (diff)
downloadlinux-stable-29433a2991fa636c1fcd5bf5893cf92c37e0b26c.tar.gz
linux-stable-29433a2991fa636c1fcd5bf5893cf92c37e0b26c.tar.bz2
linux-stable-29433a2991fa636c1fcd5bf5893cf92c37e0b26c.zip
fuse: get rid of fc->flags
Only two flags: "default_permissions" and "allow_other". All other flags are handled via bitfields. So convert these two as well. They don't change during the lifetime of the filesystem, so this is quite safe. Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Diffstat (limited to 'fs/fuse/fuse_i.h')
-rw-r--r--fs/fuse/fuse_i.h18
1 files changed, 6 insertions, 12 deletions
diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h
index e8d96ec22533..24ada5dc4dae 100644
--- a/fs/fuse/fuse_i.h
+++ b/fs/fuse/fuse_i.h
@@ -37,15 +37,6 @@
/** Number of dentries for each connection in the control filesystem */
#define FUSE_CTL_NUM_DENTRIES 5
-/** If the FUSE_DEFAULT_PERMISSIONS flag is given, the filesystem
- module will check permissions based on the file mode. Otherwise no
- permission checking is done in the kernel */
-#define FUSE_DEFAULT_PERMISSIONS (1 << 0)
-
-/** If the FUSE_ALLOW_OTHER flag is given, then not only the user
- doing the mount will be allowed to access the filesystem */
-#define FUSE_ALLOW_OTHER (1 << 1)
-
/** Number of page pointers embedded in fuse_req */
#define FUSE_REQ_INLINE_PAGES 1
@@ -470,9 +461,6 @@ struct fuse_conn {
/** The group id for this mount */
kgid_t group_id;
- /** The fuse mount flags for this mount */
- unsigned flags;
-
/** Maximum read size */
unsigned max_read;
@@ -631,6 +619,12 @@ struct fuse_conn {
/** Does the filesystem support posix acls? */
unsigned posix_acl:1;
+ /** Check permissions based on the file mode or not? */
+ unsigned default_permissions:1;
+
+ /** Allow other than the mounter user to access the filesystem ? */
+ unsigned allow_other:1;
+
/** The number of requests waiting for completion */
atomic_t num_waiting;