diff options
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/dir.c | 45 | ||||
| -rw-r--r-- | kernel/fuse_i.h | 5 | ||||
| -rw-r--r-- | kernel/fuse_kernel.h | 8 |
3 files changed, 51 insertions, 7 deletions
diff --git a/kernel/dir.c b/kernel/dir.c index 2aa16e9..26d2dfc 100644 --- a/kernel/dir.c +++ b/kernel/dir.c @@ -476,17 +476,50 @@ static int fuse_revalidate(struct dentry *entry) return fuse_do_getattr(inode); } +static int fuse_access(struct inode *inode, int mask) +{ + struct fuse_conn *fc = get_fuse_conn(inode); + struct fuse_req *req; + struct fuse_access_in inarg; + int err; + + if (fc->no_access) + return 0; + + req = fuse_get_request(fc); + if (!req) + return -EINTR; + + memset(&inarg, 0, sizeof(inarg)); + inarg.mask = mask; + req->in.h.opcode = FUSE_ACCESS; + req->in.h.nodeid = get_node_id(inode); + req->inode = inode; + req->in.numargs = 1; + req->in.args[0].size = sizeof(inarg); + req->in.args[0].value = &inarg; + request_send(fc, req); + err = req->out.h.error; + fuse_put_request(fc, req); + if (err == -ENOSYS) { + fc->no_access = 1; + err = 0; + } + return err; +} + static int fuse_permission(struct inode *inode, int mask, struct nameidata *nd) { struct fuse_conn *fc = get_fuse_conn(inode); + int err; if (!fuse_allow_task(fc, current)) return -EACCES; else if (fc->flags & FUSE_DEFAULT_PERMISSIONS) { #ifdef KERNEL_2_6_10_PLUS - int err = generic_permission(inode, mask, NULL); + err = generic_permission(inode, mask, NULL); #else - int err = vfs_permission(inode, mask); + err = vfs_permission(inode, mask); #endif /* If permission is denied, try to refresh file @@ -510,8 +543,6 @@ static int fuse_permission(struct inode *inode, int mask, struct nameidata *nd) This is actually not so grave, since the user can simply keep access to the file/directory anyway by keeping it open... */ - - return err; } else { int mode = inode->i_mode; if ((mask & MAY_WRITE) && IS_RDONLY(inode) && @@ -519,8 +550,12 @@ static int fuse_permission(struct inode *inode, int mask, struct nameidata *nd) return -EROFS; if ((mask & MAY_EXEC) && !S_ISDIR(mode) && !(mode & S_IXUGO)) return -EACCES; - return 0; + + err = 0; + if (nd->flags & LOOKUP_ACCESS) + err = fuse_access(inode, mask); } + return err; } static int parse_dirfile(char *buf, size_t nbytes, struct file *file, diff --git a/kernel/fuse_i.h b/kernel/fuse_i.h index 4faaff7..cf990fb 100644 --- a/kernel/fuse_i.h +++ b/kernel/fuse_i.h @@ -334,9 +334,12 @@ struct fuse_conn { /** Is removexattr not implemented by fs? */ unsigned no_removexattr : 1; - /** Are file locking primitives implemented by fs? */ + /** Are file locking primitives not implemented by fs? */ unsigned no_lk : 1; + /** Is access not implemented by fs */ + unsigned no_access : 1; + #ifdef KERNEL_2_6 /** Backing dev info */ struct backing_dev_info bdi; diff --git a/kernel/fuse_kernel.h b/kernel/fuse_kernel.h index fc99b7d..2c2903e 100644 --- a/kernel/fuse_kernel.h +++ b/kernel/fuse_kernel.h @@ -105,7 +105,8 @@ enum fuse_opcode { FUSE_FSYNCDIR = 30, FUSE_GETLK = 31, FUSE_SETLK = 32, - FUSE_SETLKW = 33 + FUSE_SETLKW = 33, + FUSE_ACCESS = 34 }; /* Conservative buffer size for the client */ @@ -232,6 +233,11 @@ struct fuse_lk_in_out { struct fuse_file_lock lk; }; +struct fuse_access_in { + __u32 mask; + __u32 padding; +}; + struct fuse_init_in_out { __u32 major; __u32 minor; |