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

Commit baab81fa authored by Andi Kleen's avatar Andi Kleen Committed by Dave Kleikamp
Browse files

BKL-removal: Use unlocked_ioctl for jfs 



Convert jfs_ioctl over to not use the BKL. The only potential race
I could see was with two ioctls in parallel changing the flags
and losing the updates. Use the i_mutex to protect against this.

Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarDave Kleikamp <shaggy@linux.vnet.ibm.com>
parent 0afc2edf

fs/jfs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -112,5 +112,5 @@ const struct file_operations jfs_file_operations = { 
	.splice_write	= generic_file_splice_write,

	.fsync		= jfs_fsync,

	.release	= jfs_release,

	.ioctl		= jfs_ioctl,

	.unlocked_ioctl = jfs_ioctl,

};

fs/jfs/ioctl.c

+10 −3
Original line number Diff line number Diff line
@@ -51,9 +51,9 @@ static long jfs_map_ext2(unsigned long flags, int from) 
}





int jfs_ioctl(struct inode * inode, struct file * filp, unsigned int cmd,

		unsigned long arg)

long jfs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)

{

	struct inode *inode = filp->f_dentry->d_inode;

	struct jfs_inode_info *jfs_inode = JFS_IP(inode);

	unsigned int flags;
@@ -82,6 +82,10 @@ int jfs_ioctl(struct inode * inode, struct file * filp, unsigned int cmd, 
		/* Is it quota file? Do not allow user to mess with it */

		if (IS_NOQUOTA(inode))

			return -EPERM;



		/* Lock against other parallel changes of flags */

		mutex_lock(&inode->i_mutex);



		jfs_get_inode_flags(jfs_inode);

		oldflags = jfs_inode->mode2;
@@ -92,15 +96,18 @@ int jfs_ioctl(struct inode * inode, struct file * filp, unsigned int cmd, 
		if ((oldflags & JFS_IMMUTABLE_FL) ||

			((flags ^ oldflags) &

			(JFS_APPEND_FL | JFS_IMMUTABLE_FL))) {

			if (!capable(CAP_LINUX_IMMUTABLE))

			if (!capable(CAP_LINUX_IMMUTABLE)) {

				mutex_unlock(&inode->i_mutex);

				return -EPERM;

			}

		}



		flags = flags & JFS_FL_USER_MODIFIABLE;

		flags |= oldflags & ~JFS_FL_USER_MODIFIABLE;

		jfs_inode->mode2 = flags;



		jfs_set_inode_flags(inode);

		mutex_unlock(&inode->i_mutex);

		inode->i_ctime = CURRENT_TIME_SEC;

		mark_inode_dirty(inode);

		return 0;

fs/jfs/jfs_inode.h

+1 −2
Original line number Diff line number Diff line
@@ -22,8 +22,7 @@ struct fid; 


extern struct inode *ialloc(struct inode *, umode_t);

extern int jfs_fsync(struct file *, struct dentry *, int);

extern int jfs_ioctl(struct inode *, struct file *,

			unsigned int, unsigned long);

extern long jfs_ioctl(struct file *, unsigned int, unsigned long);

extern struct inode *jfs_iget(struct super_block *, unsigned long);

extern int jfs_commit_inode(struct inode *, int);

extern int jfs_write_inode(struct inode*, int);

fs/jfs/namei.c

+1 −1
Original line number Diff line number Diff line
@@ -1556,7 +1556,7 @@ const struct file_operations jfs_dir_operations = { 
	.read		= generic_read_dir,

	.readdir	= jfs_readdir,

	.fsync		= jfs_fsync,

	.ioctl		= jfs_ioctl,

	.unlocked_ioctl = jfs_ioctl,

};



static int jfs_ci_hash(struct dentry *dir, struct qstr *this)