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

Commit e9750824 authored by Namjae Jeon's avatar Namjae Jeon Committed by Jaegeuk Kim
Browse files

f2fs: add compat_ioctl to provide backward compatability 



adding compat_ioctl to provide support for backward comptability - 32bit binary
execution on 64bit kernel.

Signed-off-by: default avatarNamjae Jeon <namjae.jeon@samsung.com>
Signed-off-by: default avatarAmit Sahrawat <a.sahrawat@samsung.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk.kim@samsung.com>
parent b7250d2d

fs/f2fs/f2fs.h

+15 −0
Original line number Diff line number Diff line
@@ -103,6 +103,20 @@ static inline int update_sits_in_cursum(struct f2fs_summary_block *rs, int i) 
	return before;

}



/*

 * ioctl commands

 */

#define F2FS_IOC_GETFLAGS               FS_IOC_GETFLAGS

#define F2FS_IOC_SETFLAGS               FS_IOC_SETFLAGS



#if defined(__KERNEL__) && defined(CONFIG_COMPAT)

/*

 * ioctl commands in 32 bit emulation

 */

#define F2FS_IOC32_GETFLAGS             FS_IOC32_GETFLAGS

#define F2FS_IOC32_SETFLAGS             FS_IOC32_SETFLAGS

#endif



/*

 * For INODE and NODE manager

 */
@@ -850,6 +864,7 @@ void f2fs_truncate(struct inode *); 
int f2fs_setattr(struct dentry *, struct iattr *);

int truncate_hole(struct inode *, pgoff_t, pgoff_t);

long f2fs_ioctl(struct file *, unsigned int, unsigned long);

long f2fs_compat_ioctl(struct file *, unsigned int, unsigned long);



/*

 * inode.c

fs/f2fs/file.c

+21 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/writeback.h>

#include <linux/falloc.h>

#include <linux/types.h>

#include <linux/compat.h>

#include <linux/uaccess.h>

#include <linux/mount.h>
@@ -634,6 +635,23 @@ long f2fs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 
	}

}



#ifdef CONFIG_COMPAT

long f2fs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)

{

	switch (cmd) {

	case F2FS_IOC32_GETFLAGS:

		cmd = F2FS_IOC_GETFLAGS;

		break;

	case F2FS_IOC32_SETFLAGS:

		cmd = F2FS_IOC_SETFLAGS;

		break;

	default:

		return -ENOIOCTLCMD;

	}

	return f2fs_ioctl(file, cmd, (unsigned long) compat_ptr(arg));

}

#endif



const struct file_operations f2fs_file_operations = {

	.llseek		= generic_file_llseek,

	.read		= do_sync_read,
@@ -645,6 +663,9 @@ const struct file_operations f2fs_file_operations = { 
	.fsync		= f2fs_sync_file,

	.fallocate	= f2fs_fallocate,

	.unlocked_ioctl	= f2fs_ioctl,

#ifdef CONFIG_COMPAT

	.compat_ioctl	= f2fs_compat_ioctl,

#endif

	.splice_read	= generic_file_splice_read,

	.splice_write	= generic_file_splice_write,

};