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

Commit 7ba4a2e8 authored by Jan Kara's avatar Jan Kara
Browse files

jfs: Remove jfs_get_inode_flags() 



Now that all places setting inode->i_flags that should be reflected in
on-disk flags are gone, we can remove jfs_get_inode_flags() call.

Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent 420768d3

fs/jfs/ioctl.c

+0 −2
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ long jfs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 


	switch (cmd) {

	case JFS_IOC_GETFLAGS:

		jfs_get_inode_flags(jfs_inode);

		flags = jfs_inode->mode2 & JFS_FL_USER_VISIBLE;

		flags = jfs_map_ext2(flags, 0);

		return put_user(flags, (int __user *) arg);
@@ -98,7 +97,6 @@ long jfs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 
		/* Lock against other parallel changes of flags */

		inode_lock(inode);



		jfs_get_inode_flags(jfs_inode);

		oldflags = jfs_inode->mode2;



		/*

fs/jfs/jfs_imap.c

+0 −1
Original line number Diff line number Diff line
@@ -3148,7 +3148,6 @@ static void copy_to_dinode(struct dinode * dip, struct inode *ip) 
	else

		dip->di_gid = cpu_to_le32(from_kgid(&init_user_ns,

						    jfs_ip->saved_gid));

	jfs_get_inode_flags(jfs_ip);

	/*

	 * mode2 is only needed for storing the higher order bits.

	 * Trust i_mode for the lower order ones

fs/jfs/jfs_inode.c

+0 −18
Original line number Diff line number Diff line
@@ -45,24 +45,6 @@ void jfs_set_inode_flags(struct inode *inode) 
			S_DIRSYNC | S_SYNC);

}



void jfs_get_inode_flags(struct jfs_inode_info *jfs_ip)

{

	unsigned int flags = jfs_ip->vfs_inode.i_flags;



	jfs_ip->mode2 &= ~(JFS_IMMUTABLE_FL | JFS_APPEND_FL | JFS_NOATIME_FL |

			   JFS_DIRSYNC_FL | JFS_SYNC_FL);

	if (flags & S_IMMUTABLE)

		jfs_ip->mode2 |= JFS_IMMUTABLE_FL;

	if (flags & S_APPEND)

		jfs_ip->mode2 |= JFS_APPEND_FL;

	if (flags & S_NOATIME)

		jfs_ip->mode2 |= JFS_NOATIME_FL;

	if (flags & S_DIRSYNC)

		jfs_ip->mode2 |= JFS_DIRSYNC_FL;

	if (flags & S_SYNC)

		jfs_ip->mode2 |= JFS_SYNC_FL;

}



/*

 * NAME:	ialloc()

 *

fs/jfs/jfs_inode.h

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ extern void jfs_truncate(struct inode *); 
extern void jfs_truncate_nolock(struct inode *, loff_t);

extern void jfs_free_zero_link(struct inode *);

extern struct dentry *jfs_get_parent(struct dentry *dentry);

extern void jfs_get_inode_flags(struct jfs_inode_info *);

extern struct dentry *jfs_fh_to_dentry(struct super_block *sb, struct fid *fid,

	int fh_len, int fh_type);

extern struct dentry *jfs_fh_to_parent(struct super_block *sb, struct fid *fid,