diff options
Diffstat (limited to 'fs/btrfs/props.c')
| -rw-r--r-- | fs/btrfs/props.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/fs/btrfs/props.c b/fs/btrfs/props.c index 0d1c3485c098..61ced0ebb5ba 100644 --- a/fs/btrfs/props.c +++ b/fs/btrfs/props.c | |||
| @@ -70,8 +70,8 @@ static int btrfs_set_prop(struct btrfs_trans_handle *trans, struct inode *inode, | |||
| 70 | return -EINVAL; | 70 | return -EINVAL; |
| 71 | 71 | ||
| 72 | if (value_len == 0) { | 72 | if (value_len == 0) { |
| 73 | ret = btrfs_setxattr(trans, inode, handler->xattr_name, | 73 | ret = btrfs_setxattr_trans(trans, inode, handler->xattr_name, |
| 74 | NULL, 0, flags); | 74 | NULL, 0, flags); |
| 75 | if (ret) | 75 | if (ret) |
| 76 | return ret; | 76 | return ret; |
| 77 | 77 | ||
| @@ -84,14 +84,14 @@ static int btrfs_set_prop(struct btrfs_trans_handle *trans, struct inode *inode, | |||
| 84 | ret = handler->validate(value, value_len); | 84 | ret = handler->validate(value, value_len); |
| 85 | if (ret) | 85 | if (ret) |
| 86 | return ret; | 86 | return ret; |
| 87 | ret = btrfs_setxattr(trans, inode, handler->xattr_name, | 87 | ret = btrfs_setxattr_trans(trans, inode, handler->xattr_name, |
| 88 | value, value_len, flags); | 88 | value, value_len, flags); |
| 89 | if (ret) | 89 | if (ret) |
| 90 | return ret; | 90 | return ret; |
| 91 | ret = handler->apply(inode, value, value_len); | 91 | ret = handler->apply(inode, value, value_len); |
| 92 | if (ret) { | 92 | if (ret) { |
| 93 | btrfs_setxattr(trans, inode, handler->xattr_name, | 93 | btrfs_setxattr_trans(trans, inode, handler->xattr_name, |
| 94 | NULL, 0, flags); | 94 | NULL, 0, flags); |
| 95 | return ret; | 95 | return ret; |
| 96 | } | 96 | } |
| 97 | 97 | ||
| @@ -358,13 +358,13 @@ static int inherit_props(struct btrfs_trans_handle *trans, | |||
| 358 | if (ret) | 358 | if (ret) |
| 359 | return ret; | 359 | return ret; |
| 360 | 360 | ||
| 361 | ret = btrfs_setxattr(trans, inode, h->xattr_name, value, | 361 | ret = btrfs_setxattr_trans(trans, inode, h->xattr_name, value, |
| 362 | strlen(value), 0); | 362 | strlen(value), 0); |
| 363 | if (!ret) { | 363 | if (!ret) { |
| 364 | ret = h->apply(inode, value, strlen(value)); | 364 | ret = h->apply(inode, value, strlen(value)); |
| 365 | if (ret) | 365 | if (ret) |
| 366 | btrfs_setxattr(trans, inode, h->xattr_name, | 366 | btrfs_setxattr_trans(trans, inode, h->xattr_name, |
| 367 | NULL, 0, 0); | 367 | NULL, 0, 0); |
| 368 | else | 368 | else |
| 369 | set_bit(BTRFS_INODE_HAS_PROPS, | 369 | set_bit(BTRFS_INODE_HAS_PROPS, |
| 370 | &BTRFS_I(inode)->runtime_flags); | 370 | &BTRFS_I(inode)->runtime_flags); |