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

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

BKL-removal: Implement a compat_ioctl handler for JFS 



The ioctls were already compatible except for the actual values so this
was fairly easy to do.

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

fs/jfs/file.c

+3 −0
Original line number Diff line number Diff line
@@ -113,4 +113,7 @@ const struct file_operations jfs_file_operations = { 
	.fsync		= jfs_fsync,

	.release	= jfs_release,

	.unlocked_ioctl = jfs_ioctl,

#ifdef CONFIG_COMPAT

	.compat_ioctl	= jfs_compat_ioctl,

#endif

};

fs/jfs/ioctl.c

+18 −0
Original line number Diff line number Diff line
@@ -117,3 +117,21 @@ long jfs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 
	}

}



#ifdef CONFIG_COMPAT

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

{

	/* While these ioctl numbers defined with 'long' and have different

	 * numbers than the 64bit ABI,

	 * the actual implementation only deals with ints and is compatible.

	 */

	switch (cmd) {

	case JFS_IOC_GETFLAGS32:

		cmd = JFS_IOC_GETFLAGS;

		break;

	case JFS_IOC_SETFLAGS32:

		cmd = JFS_IOC_SETFLAGS;

		break;

	}

	return jfs_ioctl(filp, cmd, arg);

}

#endif

fs/jfs/jfs_dinode.h

+2 −0
Original line number Diff line number Diff line
@@ -170,5 +170,7 @@ struct dinode { 
#define JFS_IOC_GETFLAGS	_IOR('f', 1, long)

#define JFS_IOC_SETFLAGS	_IOW('f', 2, long)



#define JFS_IOC_GETFLAGS32	_IOR('f', 1, int)

#define JFS_IOC_SETFLAGS32	_IOW('f', 2, int)



#endif /*_H_JFS_DINODE */

fs/jfs/jfs_inode.h

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ struct fid; 
extern struct inode *ialloc(struct inode *, umode_t);

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

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

extern long jfs_compat_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

+3 −0
Original line number Diff line number Diff line
@@ -1557,6 +1557,9 @@ const struct file_operations jfs_dir_operations = { 
	.readdir	= jfs_readdir,

	.fsync		= jfs_fsync,

	.unlocked_ioctl = jfs_ioctl,

#ifdef CONFIG_COMPAT

	.compat_ioctl	= jfs_compat_ioctl,

#endif

};



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