p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

btrfs: merge calls of btrfs_setxattr and btrfs_setxattr_trans in btrfs_set_prop 

Since now the trans argument is never NULL in btrfs_set_prop we don't
have to check. So delete it and use btrfs_setxattr that makes use of
that.

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:
Anand Jain 2019-04-20 19:49:00 +08:00 committed by David Sterba
parent 717ebdc320
commit da9b6ec829
1 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fs/btrfs/props.c
View File

@ -84,12 +84,8 @@ int btrfs_set_prop(struct btrfs_trans_handle *trans, struct inode *inode,
return -EINVAL; return -EINVAL;
if (value_len == 0) { if (value_len == 0) {
if (trans)
ret = btrfs_setxattr(trans, inode, handler->xattr_name, ret = btrfs_setxattr(trans, inode, handler->xattr_name,
NULL, 0, flags); NULL, 0, flags);
else
ret = btrfs_setxattr_trans(inode, handler->xattr_name,
NULL, 0, flags);
if (ret) if (ret)
return ret; return ret;
@ -99,23 +95,14 @@ int btrfs_set_prop(struct btrfs_trans_handle *trans, struct inode *inode,
return ret; return ret;
} }
if (trans)
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
ret = btrfs_setxattr_trans(inode, handler->xattr_name, value,
value_len, flags);
if (ret) if (ret)
return ret; return ret;
ret = handler->apply(inode, value, value_len); ret = handler->apply(inode, value, value_len);
if (ret) { if (ret) {
if (trans)
btrfs_setxattr(trans, inode, handler->xattr_name, NULL, btrfs_setxattr(trans, inode, handler->xattr_name, NULL,
0, flags); 0, flags);
else
btrfs_setxattr_trans(inode, handler->xattr_name, NULL,
0, flags);
return ret; return ret;
} }