summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/xattr.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/btrfs/xattr.c')
-rw-r--r--fs/btrfs/xattr.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/btrfs/xattr.c b/fs/btrfs/xattr.c
index fa820c56ba3e..38eb78aac0a7 100644
--- a/fs/btrfs/xattr.c
+++ b/fs/btrfs/xattr.c
@@ -220,9 +220,9 @@ out:
220/* 220/*
221 * @value: "" makes the attribute to empty, NULL removes it 221 * @value: "" makes the attribute to empty, NULL removes it
222 */ 222 */
223int btrfs_setxattr(struct btrfs_trans_handle *trans, 223int btrfs_setxattr_trans(struct btrfs_trans_handle *trans,
224 struct inode *inode, const char *name, 224 struct inode *inode, const char *name,
225 const void *value, size_t size, int flags) 225 const void *value, size_t size, int flags)
226{ 226{
227 struct btrfs_root *root = BTRFS_I(inode)->root; 227 struct btrfs_root *root = BTRFS_I(inode)->root;
228 int ret; 228 int ret;
@@ -370,7 +370,7 @@ static int btrfs_xattr_handler_set(const struct xattr_handler *handler,
370 size_t size, int flags) 370 size_t size, int flags)
371{ 371{
372 name = xattr_full_name(handler, name); 372 name = xattr_full_name(handler, name);
373 return btrfs_setxattr(NULL, inode, name, buffer, size, flags); 373 return btrfs_setxattr_trans(NULL, inode, name, buffer, size, flags);
374} 374}
375 375
376static int btrfs_xattr_handler_set_prop(const struct xattr_handler *handler, 376static int btrfs_xattr_handler_set_prop(const struct xattr_handler *handler,
@@ -441,8 +441,8 @@ static int btrfs_initxattrs(struct inode *inode,
441 } 441 }
442 strcpy(name, XATTR_SECURITY_PREFIX); 442 strcpy(name, XATTR_SECURITY_PREFIX);
443 strcpy(name + XATTR_SECURITY_PREFIX_LEN, xattr->name); 443 strcpy(name + XATTR_SECURITY_PREFIX_LEN, xattr->name);
444 err = btrfs_setxattr(trans, inode, name, xattr->value, 444 err = btrfs_setxattr_trans(trans, inode, name, xattr->value,
445 xattr->value_len, 0); 445 xattr->value_len, 0);
446 kfree(name); 446 kfree(name);
447 if (err < 0) 447 if (err < 0)
448 break; 448 break;