diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2013-06-16 11:32:35 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-06-29 04:57:24 -0400 |
commit | 6d0379ec49d99530ae6e25ee5dcf2495caee0101 (patch) | |
tree | b040aeee07b511670a3c82c9a163b7c2e8b9bdda | |
parent | 3058dca6945f12f1777eb40d43f4c97351a9c175 (diff) |
btrfs: more open-coded file_inode()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r-- | fs/btrfs/ioctl.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 0f81d67cdc8d..cd7e96c73cb7 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c | |||
@@ -3881,7 +3881,7 @@ drop_write: | |||
3881 | 3881 | ||
3882 | static long btrfs_ioctl_quota_rescan(struct file *file, void __user *arg) | 3882 | static long btrfs_ioctl_quota_rescan(struct file *file, void __user *arg) |
3883 | { | 3883 | { |
3884 | struct btrfs_root *root = BTRFS_I(fdentry(file)->d_inode)->root; | 3884 | struct btrfs_root *root = BTRFS_I(file_inode(file))->root; |
3885 | struct btrfs_ioctl_quota_rescan_args *qsa; | 3885 | struct btrfs_ioctl_quota_rescan_args *qsa; |
3886 | int ret; | 3886 | int ret; |
3887 | 3887 | ||
@@ -3914,7 +3914,7 @@ drop_write: | |||
3914 | 3914 | ||
3915 | static long btrfs_ioctl_quota_rescan_status(struct file *file, void __user *arg) | 3915 | static long btrfs_ioctl_quota_rescan_status(struct file *file, void __user *arg) |
3916 | { | 3916 | { |
3917 | struct btrfs_root *root = BTRFS_I(fdentry(file)->d_inode)->root; | 3917 | struct btrfs_root *root = BTRFS_I(file_inode(file))->root; |
3918 | struct btrfs_ioctl_quota_rescan_args *qsa; | 3918 | struct btrfs_ioctl_quota_rescan_args *qsa; |
3919 | int ret = 0; | 3919 | int ret = 0; |
3920 | 3920 | ||
@@ -4020,7 +4020,7 @@ out: | |||
4020 | 4020 | ||
4021 | static int btrfs_ioctl_get_fslabel(struct file *file, void __user *arg) | 4021 | static int btrfs_ioctl_get_fslabel(struct file *file, void __user *arg) |
4022 | { | 4022 | { |
4023 | struct btrfs_root *root = BTRFS_I(fdentry(file)->d_inode)->root; | 4023 | struct btrfs_root *root = BTRFS_I(file_inode(file))->root; |
4024 | const char *label = root->fs_info->super_copy->label; | 4024 | const char *label = root->fs_info->super_copy->label; |
4025 | size_t len = strnlen(label, BTRFS_LABEL_SIZE); | 4025 | size_t len = strnlen(label, BTRFS_LABEL_SIZE); |
4026 | int ret; | 4026 | int ret; |
@@ -4039,7 +4039,7 @@ static int btrfs_ioctl_get_fslabel(struct file *file, void __user *arg) | |||
4039 | 4039 | ||
4040 | static int btrfs_ioctl_set_fslabel(struct file *file, void __user *arg) | 4040 | static int btrfs_ioctl_set_fslabel(struct file *file, void __user *arg) |
4041 | { | 4041 | { |
4042 | struct btrfs_root *root = BTRFS_I(fdentry(file)->d_inode)->root; | 4042 | struct btrfs_root *root = BTRFS_I(file_inode(file))->root; |
4043 | struct btrfs_super_block *super_block = root->fs_info->super_copy; | 4043 | struct btrfs_super_block *super_block = root->fs_info->super_copy; |
4044 | struct btrfs_trans_handle *trans; | 4044 | struct btrfs_trans_handle *trans; |
4045 | char label[BTRFS_LABEL_SIZE]; | 4045 | char label[BTRFS_LABEL_SIZE]; |