mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -04:00
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 <[email protected]>
This commit is contained in:
parent
79a628d14e
commit
b296821a7c
31 changed files with 113 additions and 114 deletions
|
|
@ -9,14 +9,13 @@
|
|||
#include <linux/uaccess.h>
|
||||
|
||||
static int
|
||||
security_get(const struct xattr_handler *handler, struct dentry *dentry,
|
||||
const char *name, void *buffer, size_t size)
|
||||
security_get(const struct xattr_handler *handler, struct dentry *unused,
|
||||
struct inode *inode, const char *name, void *buffer, size_t size)
|
||||
{
|
||||
if (IS_PRIVATE(d_inode(dentry)))
|
||||
if (IS_PRIVATE(inode))
|
||||
return -EPERM;
|
||||
|
||||
return reiserfs_xattr_get(d_inode(dentry),
|
||||
xattr_full_name(handler, name),
|
||||
return reiserfs_xattr_get(inode, xattr_full_name(handler, name),
|
||||
buffer, size);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -8,14 +8,13 @@
|
|||
#include <linux/uaccess.h>
|
||||
|
||||
static int
|
||||
trusted_get(const struct xattr_handler *handler, struct dentry *dentry,
|
||||
const char *name, void *buffer, size_t size)
|
||||
trusted_get(const struct xattr_handler *handler, struct dentry *unused,
|
||||
struct inode *inode, const char *name, void *buffer, size_t size)
|
||||
{
|
||||
if (!capable(CAP_SYS_ADMIN) || IS_PRIVATE(d_inode(dentry)))
|
||||
if (!capable(CAP_SYS_ADMIN) || IS_PRIVATE(inode))
|
||||
return -EPERM;
|
||||
|
||||
return reiserfs_xattr_get(d_inode(dentry),
|
||||
xattr_full_name(handler, name),
|
||||
return reiserfs_xattr_get(inode, xattr_full_name(handler, name),
|
||||
buffer, size);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -7,13 +7,12 @@
|
|||
#include <linux/uaccess.h>
|
||||
|
||||
static int
|
||||
user_get(const struct xattr_handler *handler, struct dentry *dentry,
|
||||
const char *name, void *buffer, size_t size)
|
||||
user_get(const struct xattr_handler *handler, struct dentry *unused,
|
||||
struct inode *inode, const char *name, void *buffer, size_t size)
|
||||
{
|
||||
if (!reiserfs_xattrs_user(dentry->d_sb))
|
||||
if (!reiserfs_xattrs_user(inode->i_sb))
|
||||
return -EOPNOTSUPP;
|
||||
return reiserfs_xattr_get(d_inode(dentry),
|
||||
xattr_full_name(handler, name),
|
||||
return reiserfs_xattr_get(inode, xattr_full_name(handler, name),
|
||||
buffer, size);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue