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>

3 files changed, 20 insertions, 24 deletions

diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index 30d9dc976e61..f7c84ab835ca 100644
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -1028,7 +1028,7 @@ int fuse_allow_current_process(struct fuse_conn *fc)
 {
         const struct cred *cred;
 
-        if (fc->flags & FUSE_ALLOW_OTHER)
+        if (fc->allow_other)
                 return 1;
 
         cred = current_cred();
@@ -1104,7 +1104,7 @@ static int fuse_permission(struct inode *inode, int mask)
         /*
          * If attributes are needed, refresh them before proceeding
          */
-        if ((fc->flags & FUSE_DEFAULT_PERMISSIONS) ||
+        if (fc->default_permissions ||
             ((mask & MAY_EXEC) && S_ISREG(inode->i_mode))) {
                 struct fuse_inode *fi = get_fuse_inode(inode);
 
@@ -1117,7 +1117,7 @@ static int fuse_permission(struct inode *inode, int mask)
                 }
         }
 
-        if (fc->flags & FUSE_DEFAULT_PERMISSIONS) {
+        if (fc->default_permissions) {
                 err = generic_permission(inode, mask);
 
                 /* If permission is denied, try to refresh file
@@ -1618,7 +1618,7 @@ int fuse_do_setattr(struct inode *inode, struct iattr *attr,
         int err;
         bool trust_local_cmtime = is_wb && S_ISREG(inode->i_mode);
 
-        if (!(fc->flags & FUSE_DEFAULT_PERMISSIONS))
+        if (!fc->default_permissions)
                 attr->ia_valid |= ATTR_FORCE;
 
         err = inode_change_ok(inode, attr);
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;
 
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
index 16ac9d86c507..17141099f2e7 100644
--- a/fs/fuse/inode.c
+++ b/fs/fuse/inode.c
@@ -67,7 +67,8 @@ struct fuse_mount_data {
         unsigned rootmode_present:1;
         unsigned user_id_present:1;
         unsigned group_id_present:1;
-        unsigned flags;
+        unsigned default_permissions:1;
+        unsigned allow_other:1;
         unsigned max_read;
         unsigned blksize;
 };
@@ -193,7 +194,7 @@ void fuse_change_attributes_common(struct inode *inode, struct fuse_attr *attr,
          * check in may_delete().
          */
         fi->orig_i_mode = inode->i_mode;
-        if (!(fc->flags & FUSE_DEFAULT_PERMISSIONS))
+        if (!fc->default_permissions)
                 inode->i_mode &= ~S_ISVTX;
 
         fi->orig_ino = attr->ino;
@@ -534,11 +535,11 @@ static int parse_fuse_opt(char *opt, struct fuse_mount_data *d, int is_bdev)
                         break;
 
                 case OPT_DEFAULT_PERMISSIONS:
-                        d->flags |= FUSE_DEFAULT_PERMISSIONS;
+                        d->default_permissions = 1;
                         break;
 
                 case OPT_ALLOW_OTHER:
-                        d->flags |= FUSE_ALLOW_OTHER;
+                        d->allow_other = 1;
                         break;
 
                 case OPT_MAX_READ:
@@ -572,9 +573,9 @@ static int fuse_show_options(struct seq_file *m, struct dentry *root)
 
         seq_printf(m, ",user_id=%u", from_kuid_munged(&init_user_ns, fc->user_id));
         seq_printf(m, ",group_id=%u", from_kgid_munged(&init_user_ns, fc->group_id));
-        if (fc->flags & FUSE_DEFAULT_PERMISSIONS)
+        if (fc->default_permissions)
                 seq_puts(m, ",default_permissions");
-        if (fc->flags & FUSE_ALLOW_OTHER)
+        if (fc->allow_other)
                 seq_puts(m, ",allow_other");
         if (fc->max_read != ~0)
                 seq_printf(m, ",max_read=%u", fc->max_read);
@@ -917,7 +918,7 @@ static void process_init_reply(struct fuse_conn *fc, struct fuse_req *req)
                         if (arg->time_gran && arg->time_gran <= 1000000000)
                                 fc->sb->s_time_gran = arg->time_gran;
                         if ((arg->flags & FUSE_POSIX_ACL)) {
-                                fc->flags |= FUSE_DEFAULT_PERMISSIONS;
+                                fc->default_permissions = 1;
                                 fc->posix_acl = 1;
                                 fc->sb->s_xattr = fuse_acl_xattr_handlers;
                         }
@@ -1119,7 +1120,8 @@ static int fuse_fill_super(struct super_block *sb, void *data, int silent)
                 fc->dont_mask = 1;
         sb->s_flags |= MS_POSIXACL;
 
-        fc->flags = d.flags;
+        fc->default_permissions = d.default_permissions;
+        fc->allow_other = d.allow_other;
         fc->user_id = d.user_id;
         fc->group_id = d.group_id;
         fc->max_read = max_t(unsigned, 4096, d.max_read);