diff options
| author | Anand Jain <anand.jain@oracle.com> | 2019-04-12 10:02:59 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2019-04-29 19:02:44 +0200 |
| commit | e3de9b159a927fc1fd65e4d090b981b781c58926 (patch) | |
| tree | 1d9586278f68a8593f681d5c0c36d049001f0fae /fs/btrfs/xattr.c | |
| parent | btrfs: split btrfs_setxattr calls regarding transaction (diff) | |
| download | linux-e3de9b159a927fc1fd65e4d090b981b781c58926.tar.xz linux-e3de9b159a927fc1fd65e4d090b981b781c58926.zip | |
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>
Diffstat (limited to 'fs/btrfs/xattr.c')
| -rw-r--r-- | fs/btrfs/xattr.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/fs/btrfs/xattr.c b/fs/btrfs/xattr.c index 623d508f21a6..10da873d11f5 100644 --- a/fs/btrfs/xattr.c +++ b/fs/btrfs/xattr.c @@ -221,16 +221,13 @@ out: /* * @value: "" makes the attribute to empty, NULL removes it */ -int btrfs_setxattr_trans(struct btrfs_trans_handle *trans, - struct inode *inode, const char *name, +int btrfs_setxattr_trans(struct inode *inode, const char *name, const void *value, size_t size, int flags) { struct btrfs_root *root = BTRFS_I(inode)->root; + struct btrfs_trans_handle *trans; int ret; - if (trans) - return btrfs_setxattr(trans, inode, name, value, size, flags); - trans = btrfs_start_transaction(root, 2); if (IS_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) { 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, |