mirror of
https://github.com/brain-hackers/linux-brain.git
synced 2024-06-09 23:36:23 +09:00
btrfs: cleanup btrfs_setxattr_trans and drop transaction parameter
Previous patch made sure that btrfs_setxattr_trans() is called only when transaction NULL. Clean up btrfs_setxattr_trans() and drop the parameter. Signed-off-by: Anand Jain <anand.jain@oracle.com> Reviewed-by: David Sterba <dsterba@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
parent
04e6863b19
commit
e3de9b159a
|
@ -96,7 +96,7 @@ static int __btrfs_set_acl(struct btrfs_trans_handle *trans,
|
||||||
if (trans)
|
if (trans)
|
||||||
ret = btrfs_setxattr(trans, inode, name, value, size, 0);
|
ret = btrfs_setxattr(trans, inode, name, value, size, 0);
|
||||||
else
|
else
|
||||||
ret = btrfs_setxattr_trans(NULL, inode, name, value, size, 0);
|
ret = btrfs_setxattr_trans(inode, name, value, size, 0);
|
||||||
|
|
||||||
out:
|
out:
|
||||||
kfree(value);
|
kfree(value);
|
||||||
|
|
|
@ -74,9 +74,8 @@ static int btrfs_set_prop(struct btrfs_trans_handle *trans, struct inode *inode,
|
||||||
ret = btrfs_setxattr(trans, inode, handler->xattr_name,
|
ret = btrfs_setxattr(trans, inode, handler->xattr_name,
|
||||||
NULL, 0, flags);
|
NULL, 0, flags);
|
||||||
else
|
else
|
||||||
ret = btrfs_setxattr_trans(NULL, inode,
|
ret = btrfs_setxattr_trans(inode, handler->xattr_name,
|
||||||
handler->xattr_name, NULL, 0,
|
NULL, 0, flags);
|
||||||
flags);
|
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
|
@ -93,8 +92,8 @@ static int btrfs_set_prop(struct btrfs_trans_handle *trans, struct inode *inode,
|
||||||
ret = btrfs_setxattr(trans, inode, handler->xattr_name, value,
|
ret = btrfs_setxattr(trans, inode, handler->xattr_name, value,
|
||||||
value_len, flags);
|
value_len, flags);
|
||||||
else
|
else
|
||||||
ret = btrfs_setxattr_trans(NULL, inode, handler->xattr_name,
|
ret = btrfs_setxattr_trans(inode, handler->xattr_name, value,
|
||||||
value, value_len, flags);
|
value_len, flags);
|
||||||
|
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
|
@ -104,8 +103,8 @@ static int btrfs_set_prop(struct btrfs_trans_handle *trans, struct inode *inode,
|
||||||
btrfs_setxattr(trans, inode, handler->xattr_name, NULL,
|
btrfs_setxattr(trans, inode, handler->xattr_name, NULL,
|
||||||
0, flags);
|
0, flags);
|
||||||
else
|
else
|
||||||
btrfs_setxattr_trans(NULL, inode, handler->xattr_name,
|
btrfs_setxattr_trans(inode, handler->xattr_name, NULL,
|
||||||
NULL, 0, flags);
|
0, flags);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -221,16 +221,13 @@ int btrfs_setxattr(struct btrfs_trans_handle *trans, struct inode *inode,
|
||||||
/*
|
/*
|
||||||
* @value: "" makes the attribute to empty, NULL removes it
|
* @value: "" makes the attribute to empty, NULL removes it
|
||||||
*/
|
*/
|
||||||
int btrfs_setxattr_trans(struct btrfs_trans_handle *trans,
|
int btrfs_setxattr_trans(struct inode *inode, const char *name,
|
||||||
struct inode *inode, const char *name,
|
|
||||||
const void *value, size_t size, int flags)
|
const void *value, size_t size, int flags)
|
||||||
{
|
{
|
||||||
struct btrfs_root *root = BTRFS_I(inode)->root;
|
struct btrfs_root *root = BTRFS_I(inode)->root;
|
||||||
|
struct btrfs_trans_handle *trans;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
if (trans)
|
|
||||||
return btrfs_setxattr(trans, inode, name, value, size, flags);
|
|
||||||
|
|
||||||
trans = btrfs_start_transaction(root, 2);
|
trans = btrfs_start_transaction(root, 2);
|
||||||
if (IS_ERR(trans))
|
if (IS_ERR(trans))
|
||||||
return PTR_ERR(trans);
|
return PTR_ERR(trans);
|
||||||
|
@ -368,7 +365,7 @@ static int btrfs_xattr_handler_set(const struct xattr_handler *handler,
|
||||||
size_t size, int flags)
|
size_t size, int flags)
|
||||||
{
|
{
|
||||||
name = xattr_full_name(handler, name);
|
name = xattr_full_name(handler, name);
|
||||||
return btrfs_setxattr_trans(NULL, inode, name, buffer, size, flags);
|
return btrfs_setxattr_trans(inode, name, buffer, size, flags);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int btrfs_xattr_handler_set_prop(const struct xattr_handler *handler,
|
static int btrfs_xattr_handler_set_prop(const struct xattr_handler *handler,
|
||||||
|
|
|
@ -14,9 +14,8 @@ int btrfs_getxattr(struct inode *inode, const char *name,
|
||||||
void *buffer, size_t size);
|
void *buffer, size_t size);
|
||||||
int btrfs_setxattr(struct btrfs_trans_handle *trans, struct inode *inode,
|
int btrfs_setxattr(struct btrfs_trans_handle *trans, struct inode *inode,
|
||||||
const char *name, const void *value, size_t size, int flags);
|
const char *name, const void *value, size_t size, int flags);
|
||||||
int btrfs_setxattr_trans(struct btrfs_trans_handle *trans,
|
int btrfs_setxattr_trans(struct inode *inode, const char *name,
|
||||||
struct inode *inode, const char *name,
|
const void *value, size_t size, int flags);
|
||||||
const void *value, size_t size, int flags);
|
|
||||||
ssize_t btrfs_listxattr(struct dentry *dentry, char *buffer, size_t size);
|
ssize_t btrfs_listxattr(struct dentry *dentry, char *buffer, size_t size);
|
||||||
|
|
||||||
int btrfs_xattr_security_init(struct btrfs_trans_handle *trans,
|
int btrfs_xattr_security_init(struct btrfs_trans_handle *trans,
|
||||||
|
|
Loading…
Reference in New Issue
Block a user