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

Commit 19aee8de authored by Anand Jain's avatar Anand Jain Committed by David Sterba
Browse files

btrfs: btrfs_inherit_iflags() can be static 



btrfs_new_inode() is the only consumer move it to inode.c,
from ioctl.c.

Signed-off-by: default avatarAnand Jain <anand.jain@oracle.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 26b28dce

fs/btrfs/ctree.h

+0 −1
Original line number Diff line number Diff line
@@ -3230,7 +3230,6 @@ long btrfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg); 
long btrfs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg);

int btrfs_ioctl_get_supported_features(void __user *arg);

void btrfs_update_iflags(struct inode *inode);

void btrfs_inherit_iflags(struct inode *inode, struct inode *dir);

int btrfs_is_empty_uuid(u8 *uuid);

int btrfs_defrag_file(struct inode *inode, struct file *file,

		      struct btrfs_ioctl_defrag_range_args *range,

fs/btrfs/inode.c

+31 −0
Original line number Diff line number Diff line
@@ -6183,6 +6183,37 @@ static int btrfs_insert_inode_locked(struct inode *inode) 
		   btrfs_find_actor, &args);

}



/*

 * Inherit flags from the parent inode.

 *

 * Currently only the compression flags and the cow flags are inherited.

 */

static void btrfs_inherit_iflags(struct inode *inode, struct inode *dir)

{

	unsigned int flags;



	if (!dir)

		return;



	flags = BTRFS_I(dir)->flags;



	if (flags & BTRFS_INODE_NOCOMPRESS) {

		BTRFS_I(inode)->flags &= ~BTRFS_INODE_COMPRESS;

		BTRFS_I(inode)->flags |= BTRFS_INODE_NOCOMPRESS;

	} else if (flags & BTRFS_INODE_COMPRESS) {

		BTRFS_I(inode)->flags &= ~BTRFS_INODE_NOCOMPRESS;

		BTRFS_I(inode)->flags |= BTRFS_INODE_COMPRESS;

	}



	if (flags & BTRFS_INODE_NODATACOW) {

		BTRFS_I(inode)->flags |= BTRFS_INODE_NODATACOW;

		if (S_ISREG(inode->i_mode))

			BTRFS_I(inode)->flags |= BTRFS_INODE_NODATASUM;

	}



	btrfs_update_iflags(inode);

}



static struct inode *btrfs_new_inode(struct btrfs_trans_handle *trans,

				     struct btrfs_root *root,

				     struct inode *dir,

fs/btrfs/ioctl.c

+0 −31
Original line number Diff line number Diff line
@@ -156,37 +156,6 @@ void btrfs_update_iflags(struct inode *inode) 
		      new_fl);

}



/*

 * Inherit flags from the parent inode.

 *

 * Currently only the compression flags and the cow flags are inherited.

 */

void btrfs_inherit_iflags(struct inode *inode, struct inode *dir)

{

	unsigned int flags;



	if (!dir)

		return;



	flags = BTRFS_I(dir)->flags;



	if (flags & BTRFS_INODE_NOCOMPRESS) {

		BTRFS_I(inode)->flags &= ~BTRFS_INODE_COMPRESS;

		BTRFS_I(inode)->flags |= BTRFS_INODE_NOCOMPRESS;

	} else if (flags & BTRFS_INODE_COMPRESS) {

		BTRFS_I(inode)->flags &= ~BTRFS_INODE_NOCOMPRESS;

		BTRFS_I(inode)->flags |= BTRFS_INODE_COMPRESS;

	}



	if (flags & BTRFS_INODE_NODATACOW) {

		BTRFS_I(inode)->flags |= BTRFS_INODE_NODATACOW;

		if (S_ISREG(inode->i_mode))

			BTRFS_I(inode)->flags |= BTRFS_INODE_NODATASUM;

	}



	btrfs_update_iflags(inode);

}



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

{

	struct btrfs_inode *ip = BTRFS_I(file_inode(file));