Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d0379ec authored by Al Viro's avatar Al Viro
Browse files

btrfs: more open-coded file_inode() 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 3058dca6

fs/btrfs/ioctl.c

+4 −4
Original line number Diff line number Diff line
@@ -3881,7 +3881,7 @@ static long btrfs_ioctl_qgroup_limit(struct file *file, void __user *arg) 


static long btrfs_ioctl_quota_rescan(struct file *file, void __user *arg)

{

	struct btrfs_root *root = BTRFS_I(fdentry(file)->d_inode)->root;

	struct btrfs_root *root = BTRFS_I(file_inode(file))->root;

	struct btrfs_ioctl_quota_rescan_args *qsa;

	int ret;
@@ -3914,7 +3914,7 @@ static long btrfs_ioctl_quota_rescan(struct file *file, void __user *arg) 


static long btrfs_ioctl_quota_rescan_status(struct file *file, void __user *arg)

{

	struct btrfs_root *root = BTRFS_I(fdentry(file)->d_inode)->root;

	struct btrfs_root *root = BTRFS_I(file_inode(file))->root;

	struct btrfs_ioctl_quota_rescan_args *qsa;

	int ret = 0;
@@ -4020,7 +4020,7 @@ static long btrfs_ioctl_set_received_subvol(struct file *file, 


static int btrfs_ioctl_get_fslabel(struct file *file, void __user *arg)

{

	struct btrfs_root *root = BTRFS_I(fdentry(file)->d_inode)->root;

	struct btrfs_root *root = BTRFS_I(file_inode(file))->root;

	const char *label = root->fs_info->super_copy->label;

	size_t len = strnlen(label, BTRFS_LABEL_SIZE);

	int ret;
@@ -4039,7 +4039,7 @@ static int btrfs_ioctl_get_fslabel(struct file *file, void __user *arg) 


static int btrfs_ioctl_set_fslabel(struct file *file, void __user *arg)

{

	struct btrfs_root *root = BTRFS_I(fdentry(file)->d_inode)->root;

	struct btrfs_root *root = BTRFS_I(file_inode(file))->root;

	struct btrfs_super_block *super_block = root->fs_info->super_copy;

	struct btrfs_trans_handle *trans;

	char label[BTRFS_LABEL_SIZE];