tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

btrfs: pass a btrfs_inode to btrfs_set_prop()

Pass a struct btrfs_inode to btrfs_set_prop() as it's an
internal interface, allowing to remove some use of BTRFS_I.

Reviewed-by: Boris Burkov <boris@bur.io>
Signed-off-by: David Sterba <dsterba@suse.com>

David Sterba 0d9b7e16 e2877c2a

+13 -13
+4 -4
fs/btrfs/ioctl.c
··· 375 375 return PTR_ERR(trans); 376 376 377 377 if (comp) { 378 - ret = btrfs_set_prop(trans, inode, "btrfs.compression", comp, 379 - strlen(comp), 0); 378 + ret = btrfs_set_prop(trans, BTRFS_I(inode), "btrfs.compression", 379 + comp, strlen(comp), 0); 380 380 if (ret) { 381 381 btrfs_abort_transaction(trans, ret); 382 382 goto out_end_trans; 383 383 } 384 384 } else { 385 - ret = btrfs_set_prop(trans, inode, "btrfs.compression", NULL, 386 - 0, 0); 385 + ret = btrfs_set_prop(trans, BTRFS_I(inode), "btrfs.compression", 386 + NULL, 0, 0); 387 387 if (ret && ret != -ENODATA) { 388 388 btrfs_abort_transaction(trans, ret); 389 389 goto out_end_trans;
+7 -7
fs/btrfs/props.c
··· 104 104 return handler->ignore(inode); 105 105 } 106 106 107 - int btrfs_set_prop(struct btrfs_trans_handle *trans, struct inode *inode, 107 + int btrfs_set_prop(struct btrfs_trans_handle *trans, struct btrfs_inode *inode, 108 108 const char *name, const char *value, size_t value_len, 109 109 int flags) 110 110 { ··· 116 116 return -EINVAL; 117 117 118 118 if (value_len == 0) { 119 - ret = btrfs_setxattr(trans, inode, handler->xattr_name, 119 + ret = btrfs_setxattr(trans, &inode->vfs_inode, handler->xattr_name, 120 120 NULL, 0, flags); 121 121 if (ret) 122 122 return ret; 123 123 124 - ret = handler->apply(inode, NULL, 0); 124 + ret = handler->apply(&inode->vfs_inode, NULL, 0); 125 125 ASSERT(ret == 0); 126 126 127 127 return ret; 128 128 } 129 129 130 - ret = btrfs_setxattr(trans, inode, handler->xattr_name, value, 130 + ret = btrfs_setxattr(trans, &inode->vfs_inode, handler->xattr_name, value, 131 131 value_len, flags); 132 132 if (ret) 133 133 return ret; 134 - ret = handler->apply(inode, value, value_len); 134 + ret = handler->apply(&inode->vfs_inode, value, value_len); 135 135 if (ret) { 136 - btrfs_setxattr(trans, inode, handler->xattr_name, NULL, 136 + btrfs_setxattr(trans, &inode->vfs_inode, handler->xattr_name, NULL, 137 137 0, flags); 138 138 return ret; 139 139 } 140 140 141 - set_bit(BTRFS_INODE_HAS_PROPS, &BTRFS_I(inode)->runtime_flags); 141 + set_bit(BTRFS_INODE_HAS_PROPS, &inode->runtime_flags); 142 142 143 143 return 0; 144 144 }
+1 -1
fs/btrfs/props.h
··· 15 15 16 16 int __init btrfs_props_init(void); 17 17 18 - int btrfs_set_prop(struct btrfs_trans_handle *trans, struct inode *inode, 18 + int btrfs_set_prop(struct btrfs_trans_handle *trans, struct btrfs_inode *inode, 19 19 const char *name, const char *value, size_t value_len, 20 20 int flags); 21 21 int btrfs_validate_prop(const struct btrfs_inode *inode, const char *name,
+1 -1
fs/btrfs/xattr.c
··· 451 451 if (IS_ERR(trans)) 452 452 return PTR_ERR(trans); 453 453 454 - ret = btrfs_set_prop(trans, inode, name, value, size, flags); 454 + ret = btrfs_set_prop(trans, BTRFS_I(inode), name, value, size, flags); 455 455 if (!ret) { 456 456 inode_inc_iversion(inode); 457 457 inode_set_ctime_current(inode);