mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -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
|
|
@ -579,7 +579,7 @@ failed_getxattr_init:
|
|||
return res;
|
||||
}
|
||||
|
||||
ssize_t hfsplus_getxattr(struct dentry *dentry, const char *name,
|
||||
ssize_t hfsplus_getxattr(struct inode *inode, const char *name,
|
||||
void *value, size_t size,
|
||||
const char *prefix, size_t prefixlen)
|
||||
{
|
||||
|
|
@ -594,7 +594,7 @@ ssize_t hfsplus_getxattr(struct dentry *dentry, const char *name,
|
|||
strcpy(xattr_name, prefix);
|
||||
strcpy(xattr_name + prefixlen, name);
|
||||
|
||||
res = __hfsplus_getxattr(d_inode(dentry), xattr_name, value, size);
|
||||
res = __hfsplus_getxattr(inode, xattr_name, value, size);
|
||||
kfree(xattr_name);
|
||||
return res;
|
||||
|
||||
|
|
@ -844,8 +844,8 @@ end_removexattr:
|
|||
}
|
||||
|
||||
static int hfsplus_osx_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)
|
||||
{
|
||||
/*
|
||||
* Don't allow retrieving properly prefixed attributes
|
||||
|
|
@ -860,7 +860,7 @@ static int hfsplus_osx_getxattr(const struct xattr_handler *handler,
|
|||
* creates), so we pass the name through unmodified (after
|
||||
* ensuring it doesn't conflict with another namespace).
|
||||
*/
|
||||
return __hfsplus_getxattr(d_inode(dentry), name, buffer, size);
|
||||
return __hfsplus_getxattr(inode, name, buffer, size);
|
||||
}
|
||||
|
||||
static int hfsplus_osx_setxattr(const struct xattr_handler *handler,
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ int hfsplus_setxattr(struct dentry *dentry, const char *name,
|
|||
ssize_t __hfsplus_getxattr(struct inode *inode, const char *name,
|
||||
void *value, size_t size);
|
||||
|
||||
ssize_t hfsplus_getxattr(struct dentry *dentry, const char *name,
|
||||
ssize_t hfsplus_getxattr(struct inode *inode, const char *name,
|
||||
void *value, size_t size,
|
||||
const char *prefix, size_t prefixlen);
|
||||
|
||||
|
|
|
|||
|
|
@ -14,10 +14,10 @@
|
|||
#include "acl.h"
|
||||
|
||||
static int hfsplus_security_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 hfsplus_getxattr(dentry, name, buffer, size,
|
||||
return hfsplus_getxattr(inode, name, buffer, size,
|
||||
XATTR_SECURITY_PREFIX,
|
||||
XATTR_SECURITY_PREFIX_LEN);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,10 +12,10 @@
|
|||
#include "xattr.h"
|
||||
|
||||
static int hfsplus_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 hfsplus_getxattr(dentry, name, buffer, size,
|
||||
return hfsplus_getxattr(inode, name, buffer, size,
|
||||
XATTR_TRUSTED_PREFIX,
|
||||
XATTR_TRUSTED_PREFIX_LEN);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@
|
|||
#include "xattr.h"
|
||||
|
||||
static int hfsplus_user_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 hfsplus_getxattr(dentry, name, buffer, size,
|
||||
return hfsplus_getxattr(inode, name, buffer, size,
|
||||
XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue