openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ubifs: Export xattr get and set functions 

For fscrypto we need this function outside of xattr.c.

Signed-off-by: Richard Weinberger <richard@nod.at>
This commit is contained in:
Richard Weinberger 2016-09-19 21:42:06 +02:00
parent f6337d8426
commit ade46c3a60
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/ubifs/ubifs.h
View File

@ -1735,6 +1735,10 @@ extern const struct xattr_handler *ubifs_xattr_handlers[];
ssize_t ubifs_listxattr(struct dentry *dentry, char *buffer, size_t size);
int ubifs_init_security(struct inode *dentry, struct inode *inode,
const struct qstr *qstr);
int ubifs_xattr_set(struct inode *host, const char *name, const void *value,
size_t size, int flags);
ssize_t ubifs_xattr_get(struct inode *host, const char *name, void *buf,
size_t size);
/* super.c */
struct inode *ubifs_iget(struct super_block *sb, unsigned long inum);

35
fs/ubifs/xattr.c
View File

@ -269,8 +269,8 @@ static struct inode *iget_xattr(struct ubifs_info *c, ino_t inum)
return ERR_PTR(-EINVAL);
}
static int __ubifs_setxattr(struct inode *host, const char *name,
const void *value, size_t size, int flags)
int ubifs_xattr_set(struct inode *host, const char *name, const void *value,
size_t size, int flags)
{
struct inode *inode;
struct ubifs_info *c = host->i_sb->s_fs_info;
@ -329,8 +329,8 @@ static int __ubifs_setxattr(struct inode *host, const char *name,
return err;
}
static ssize_t __ubifs_getxattr(struct inode *host, const char *name,
void *buf, size_t size)
ssize_t ubifs_xattr_get(struct inode *host, const char *name, void *buf,
size_t size)
{
struct inode *inode;
struct ubifs_info *c = host->i_sb->s_fs_info;
@ -486,7 +486,7 @@ static int remove_xattr(struct ubifs_info *c, struct inode *host,
return err;
}
static int __ubifs_removexattr(struct inode *host, const char *name)
static int ubifs_xattr_remove(struct inode *host, const char *name)
{
struct inode *inode;
struct ubifs_info *c = host->i_sb->s_fs_info;
@ -548,7 +548,8 @@ static int init_xattrs(struct inode *inode, const struct xattr *xattr_array,
}
strcpy(name, XATTR_SECURITY_PREFIX);
strcpy(name + XATTR_SECURITY_PREFIX_LEN, xattr->name);
err = __ubifs_setxattr(inode, name, xattr->value, xattr->value_len, 0);
err = ubifs_xattr_set(inode, name, xattr->value,
xattr->value_len, 0);
kfree(name);
if (err < 0)
break;
@ -572,7 +573,7 @@ int ubifs_init_security(struct inode *dentry, struct inode *inode,
return err;
}
static int ubifs_xattr_get(const struct xattr_handler *handler,
static int xattr_get(const struct xattr_handler *handler,
struct dentry *dentry, struct inode *inode,
const char *name, void *buffer, size_t size)
{
@ -580,10 +581,10 @@ static int ubifs_xattr_get(const struct xattr_handler *handler,
inode->i_ino, dentry, size);
name = xattr_full_name(handler, name);
return __ubifs_getxattr(inode, name, buffer, size);
return ubifs_xattr_get(inode, name, buffer, size);
}
static int ubifs_xattr_set(const struct xattr_handler *handler,
static int xattr_set(const struct xattr_handler *handler,
struct dentry *dentry, struct inode *inode,
const char *name, const void *value,
size_t size, int flags)
@ -594,27 +595,27 @@ static int ubifs_xattr_set(const struct xattr_handler *handler,
name = xattr_full_name(handler, name);
if (value)
return __ubifs_setxattr(inode, name, value, size, flags);
return ubifs_xattr_set(inode, name, value, size, flags);
else
return __ubifs_removexattr(inode, name);
return ubifs_xattr_remove(inode, name);
}
static const struct xattr_handler ubifs_user_xattr_handler = {
.prefix = XATTR_USER_PREFIX,
.get = ubifs_xattr_get,
.set = ubifs_xattr_set,
.get = xattr_get,
.set = xattr_set,
};
static const struct xattr_handler ubifs_trusted_xattr_handler = {
.prefix = XATTR_TRUSTED_PREFIX,
.get = ubifs_xattr_get,
.set = ubifs_xattr_set,
.get = xattr_get,
.set = xattr_set,
};
static const struct xattr_handler ubifs_security_xattr_handler = {
.prefix = XATTR_SECURITY_PREFIX,
.get = ubifs_xattr_get,
.set = ubifs_xattr_set,
.get = xattr_get,
.set = xattr_set,
};
const struct xattr_handler *ubifs_xattr_handlers[] = {