Commit 7b6a221e authored by David Sterba's avatar David Sterba
Browse files

btrfs: rename btrfs_update_iflags to reflect which flags it touches 



The btrfs inode flag flavour is now simply called 'inode flags' and the
vfs inode are i_flags.

Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent d9a071f0

fs/btrfs/ctree.h

+1 −1
Original line number Diff line number Diff line
@@ -3249,7 +3249,7 @@ void btrfs_test_inode_set_ops(struct inode *inode); 
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_sync_inode_flags_to_i_flags(struct inode *inode);

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

+2 −2
Original line number Diff line number Diff line
@@ -3929,7 +3929,7 @@ static int btrfs_read_locked_inode(struct inode *inode) 
		break;

	}



	btrfs_update_iflags(inode);

	btrfs_sync_inode_flags_to_i_flags(inode);

	return 0;



make_bad:
@@ -6458,7 +6458,7 @@ static void btrfs_inherit_iflags(struct inode *inode, struct inode *dir) 
			BTRFS_I(inode)->flags |= BTRFS_INODE_NODATASUM;

	}



	btrfs_update_iflags(inode);

	btrfs_sync_inode_flags_to_i_flags(inode);

}



static struct inode *btrfs_new_inode(struct btrfs_trans_handle *trans,

fs/btrfs/ioctl.c

+2 −2
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ static unsigned int btrfs_flags_to_ioctl(unsigned int flags) 
/*

 * Update inode->i_flags based on the btrfs internal flags.

 */

void btrfs_update_iflags(struct inode *inode)

void btrfs_sync_inode_flags_to_i_flags(struct inode *inode)

{

	struct btrfs_inode *ip = BTRFS_I(inode);

	unsigned int new_fl = 0;
@@ -317,7 +317,7 @@ static int btrfs_ioctl_setflags(struct file *file, void __user *arg) 
		goto out_drop;

	}



	btrfs_update_iflags(inode);

	btrfs_sync_inode_flags_to_i_flags(inode);

	inode_inc_iversion(inode);

	inode->i_ctime = current_time(inode);

	ret = btrfs_update_inode(trans, root, inode);