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

Commit 54563d41 authored by Al Viro's avatar Al Viro Committed by Chris Mason
Browse files

btrfs: get rid of fdentry() 



3 of 4 callers actually want file_inode()...

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarChris Mason <chris.mason@fusionio.com>
parent 46e0f66a

fs/btrfs/ctree.h

+0 −5
Original line number Original line Diff line number Diff line
@@ -3111,11 +3111,6 @@ static inline u32 btrfs_level_size(struct btrfs_root *root, int level) 
	((unsigned long)(btrfs_leaf_data(leaf) + \

	((unsigned long)(btrfs_leaf_data(leaf) + \

	btrfs_item_offset_nr(leaf, slot)))

	btrfs_item_offset_nr(leaf, slot)))





static inline struct dentry *fdentry(struct file *file)

{

	return file->f_path.dentry;

}



static inline bool btrfs_mixed_space_info(struct btrfs_space_info *space_info)

static inline bool btrfs_mixed_space_info(struct btrfs_space_info *space_info)

{

{

	return ((space_info->flags & BTRFS_BLOCK_GROUP_METADATA) &&

	return ((space_info->flags & BTRFS_BLOCK_GROUP_METADATA) &&

fs/btrfs/ioctl.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -320,7 +320,7 @@ static int btrfs_ioctl_getversion(struct file *file, int __user *arg) 




static noinline int btrfs_ioctl_fitrim(struct file *file, void __user *arg)

static noinline int btrfs_ioctl_fitrim(struct file *file, void __user *arg)

{

{

	struct btrfs_fs_info *fs_info = btrfs_sb(fdentry(file)->d_sb);

	struct btrfs_fs_info *fs_info = btrfs_sb(file_inode(file)->i_sb);

	struct btrfs_device *device;

	struct btrfs_device *device;

	struct request_queue *q;

	struct request_queue *q;

	struct fstrim_range range;

	struct fstrim_range range;
@@ -2089,7 +2089,7 @@ static noinline int btrfs_ioctl_ino_lookup(struct file *file, 
static noinline int btrfs_ioctl_snap_destroy(struct file *file,

static noinline int btrfs_ioctl_snap_destroy(struct file *file,

					     void __user *arg)

					     void __user *arg)

{

{

	struct dentry *parent = fdentry(file);

	struct dentry *parent = file->f_path.dentry;

	struct dentry *dentry;

	struct dentry *dentry;

	struct inode *dir = parent->d_inode;

	struct inode *dir = parent->d_inode;

	struct inode *inode;

	struct inode *inode;
@@ -3105,7 +3105,7 @@ out: 
static noinline long btrfs_ioctl_clone(struct file *file, unsigned long srcfd,

static noinline long btrfs_ioctl_clone(struct file *file, unsigned long srcfd,

				       u64 off, u64 olen, u64 destoff)

				       u64 off, u64 olen, u64 destoff)

{

{

	struct inode *inode = fdentry(file)->d_inode;

	struct inode *inode = file_inode(file);

	struct btrfs_root *root = BTRFS_I(inode)->root;

	struct btrfs_root *root = BTRFS_I(inode)->root;

	struct fd src_file;

	struct fd src_file;

	struct inode *src;

	struct inode *src;
@@ -4304,7 +4304,7 @@ static long btrfs_ioctl_quota_rescan_status(struct file *file, void __user *arg) 




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

static long btrfs_ioctl_quota_rescan_wait(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;





	if (!capable(CAP_SYS_ADMIN))

	if (!capable(CAP_SYS_ADMIN))

		return -EPERM;

		return -EPERM;