diff options
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/configure.ac | 2 | ||||
| -rw-r--r-- | kernel/dir.c | 39 | ||||
| -rw-r--r-- | kernel/fuse_i.h | 3 | ||||
| -rw-r--r-- | kernel/fuse_kernel.h | 8 |
4 files changed, 50 insertions, 2 deletions
diff --git a/kernel/configure.ac b/kernel/configure.ac index 5f31daa..04483e3 100644 --- a/kernel/configure.ac +++ b/kernel/configure.ac @@ -1,4 +1,4 @@ -AC_INIT(fuse-kernel, 2.4.1) +AC_INIT(fuse-kernel, 2.5.0-pre0) AC_CONFIG_HEADERS([config.h]) AC_PROG_INSTALL diff --git a/kernel/dir.c b/kernel/dir.c index 6753636..20a6aae 100644 --- a/kernel/dir.c +++ b/kernel/dir.c @@ -482,6 +482,40 @@ static int fuse_revalidate(struct dentry *entry) return fuse_do_getattr(inode); } +#ifdef KERNEL_2_6 +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; +} +#endif + static int fuse_permission(struct inode *inode, int mask, struct nameidata *nd) { struct fuse_conn *fc = get_fuse_conn(inode); @@ -525,6 +559,11 @@ 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; + +#ifdef KERNEL_2_6 + if (nd && (nd->flags & LOOKUP_ACCESS)) + return fuse_access(inode, mask); +#endif return 0; } } diff --git a/kernel/fuse_i.h b/kernel/fuse_i.h index b8270ce..af9457d 100644 --- a/kernel/fuse_i.h +++ b/kernel/fuse_i.h @@ -340,6 +340,9 @@ struct fuse_conn { /** Is removexattr not implemented by fs? */ unsigned no_removexattr : 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 1dc9e06..7710201 100644 --- a/kernel/fuse_kernel.h +++ b/kernel/fuse_kernel.h @@ -127,7 +127,8 @@ enum fuse_opcode { FUSE_OPENDIR = 27, FUSE_READDIR = 28, FUSE_RELEASEDIR = 29, - FUSE_FSYNCDIR = 30 + FUSE_FSYNCDIR = 30, + FUSE_ACCESS = 34 }; /* Conservative buffer size for the client */ @@ -250,6 +251,11 @@ struct fuse_getxattr_out { __u32 padding; }; +struct fuse_access_in { + __u32 mask; + __u32 padding; +}; + struct fuse_init_in_out { __u32 major; __u32 minor; |