diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2016-04-10 20:48:24 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-04-10 20:48:24 -0400 |
commit | b296821a7c42fa58baa17513b2b7b30ae66f3336 (patch) | |
tree | 5cb6593218b793ff77df1c21ea74b756af9c8540 /fs/posix_acl.c | |
parent | 79a628d14ec7ee9adfdc3ce04343d5ff7ec20c18 (diff) |
xattr_handler: pass dentry and inode as separate arguments of ->get()
... and do not assume they are already attached to each other
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/posix_acl.c')
-rw-r--r-- | fs/posix_acl.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/posix_acl.c b/fs/posix_acl.c index db1fb0f5d9ff..2c60f17e7d92 100644 --- a/fs/posix_acl.c +++ b/fs/posix_acl.c | |||
@@ -797,18 +797,18 @@ EXPORT_SYMBOL (posix_acl_to_xattr); | |||
797 | 797 | ||
798 | static int | 798 | static int |
799 | posix_acl_xattr_get(const struct xattr_handler *handler, | 799 | posix_acl_xattr_get(const struct xattr_handler *handler, |
800 | struct dentry *dentry, const char *name, | 800 | struct dentry *unused, struct inode *inode, |
801 | void *value, size_t size) | 801 | const char *name, void *value, size_t size) |
802 | { | 802 | { |
803 | struct posix_acl *acl; | 803 | struct posix_acl *acl; |
804 | int error; | 804 | int error; |
805 | 805 | ||
806 | if (!IS_POSIXACL(d_backing_inode(dentry))) | 806 | if (!IS_POSIXACL(inode)) |
807 | return -EOPNOTSUPP; | 807 | return -EOPNOTSUPP; |
808 | if (d_is_symlink(dentry)) | 808 | if (S_ISLNK(inode->i_mode)) |
809 | return -EOPNOTSUPP; | 809 | return -EOPNOTSUPP; |
810 | 810 | ||
811 | acl = get_acl(d_backing_inode(dentry), handler->flags); | 811 | acl = get_acl(inode, handler->flags); |
812 | if (IS_ERR(acl)) | 812 | if (IS_ERR(acl)) |
813 | return PTR_ERR(acl); | 813 | return PTR_ERR(acl); |
814 | if (acl == NULL) | 814 | if (acl == NULL) |