diff options
| author | Al Viro | 2016-05-03 01:45:47 +0200 |
|---|---|---|
| committer | Al Viro | 2016-05-03 01:45:47 +0200 |
| commit | 84695ffee7987ee1e581be4c4696e47e1a29403b (patch) | |
| tree | 78ca09a96ecd6a6b5f4fae744c381968635af68d /fs/jffs2/xattr_trusted.c | |
| parent | Linux 4.6-rc3 (diff) | |
| parent | ->getxattr(): pass dentry and inode as separate arguments (diff) | |
| download | kernel-qcow2-linux-84695ffee7987ee1e581be4c4696e47e1a29403b.tar.gz kernel-qcow2-linux-84695ffee7987ee1e581be4c4696e47e1a29403b.tar.xz kernel-qcow2-linux-84695ffee7987ee1e581be4c4696e47e1a29403b.zip | |
Merge getxattr prototype change into work.lookups
The rest of work.xattr stuff isn't needed for this branch
Diffstat (limited to 'fs/jffs2/xattr_trusted.c')
| -rw-r--r-- | fs/jffs2/xattr_trusted.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/jffs2/xattr_trusted.c b/fs/jffs2/xattr_trusted.c index b2555ef07a12..4ebecff1d922 100644 --- a/fs/jffs2/xattr_trusted.c +++ b/fs/jffs2/xattr_trusted.c @@ -17,10 +17,10 @@ #include "nodelist.h" static int jffs2_trusted_getxattr(const struct xattr_handler *handler, - struct dentry *dentry, const char *name, - void *buffer, size_t size) + struct dentry *unused, struct inode *inode, + const char *name, void *buffer, size_t size) { - return do_jffs2_getxattr(d_inode(dentry), JFFS2_XPREFIX_TRUSTED, + return do_jffs2_getxattr(inode, JFFS2_XPREFIX_TRUSTED, name, buffer, size); } |