diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2016-05-02 19:45:47 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-05-02 19:45:47 -0400 |
commit | 84695ffee7987ee1e581be4c4696e47e1a29403b (patch) | |
tree | 78ca09a96ecd6a6b5f4fae744c381968635af68d /fs/fuse | |
parent | bf16200689118d19de1b8d2a3c314fc21f5dc7bb (diff) | |
parent | ce23e640133484eebc20ca7b7668388213e11327 (diff) | |
download | op-kernel-dev-84695ffee7987ee1e581be4c4696e47e1a29403b.zip op-kernel-dev-84695ffee7987ee1e581be4c4696e47e1a29403b.tar.gz |
Merge getxattr prototype change into work.lookups
The rest of work.xattr stuff isn't needed for this branch
Diffstat (limited to 'fs/fuse')
-rw-r--r-- | fs/fuse/dir.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c index 4b855b6..b618527 100644 --- a/fs/fuse/dir.c +++ b/fs/fuse/dir.c @@ -1759,10 +1759,9 @@ static int fuse_setxattr(struct dentry *entry, const char *name, return err; } -static ssize_t fuse_getxattr(struct dentry *entry, const char *name, - void *value, size_t size) +static ssize_t fuse_getxattr(struct dentry *entry, struct inode *inode, + const char *name, void *value, size_t size) { - struct inode *inode = d_inode(entry); struct fuse_conn *fc = get_fuse_conn(inode); FUSE_ARGS(args); struct fuse_getxattr_in inarg; |