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

Commit 0533400b authored by Stoyan Gaydarov's avatar Stoyan Gaydarov Committed by David Woodhouse
Browse files

[JFFS2] Use .unlocked_ioctl 



This changes the .ioctl to the .unlocked_ioctl version.

Signed-off-by: default avatarStoyan Gaydarov <stoyboyker@gmail.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 36560d25

fs/jffs2/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ const struct file_operations jffs2_dir_operations = 
{

	.read =		generic_read_dir,

	.readdir =	jffs2_readdir,

	.ioctl =	jffs2_ioctl,

	.unlocked_ioctl=jffs2_ioctl,

	.fsync =	jffs2_fsync

};

fs/jffs2/file.c

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ const struct file_operations jffs2_file_operations = 
 	.aio_read =	generic_file_aio_read,

 	.write =	do_sync_write,

 	.aio_write =	generic_file_aio_write,

	.ioctl =	jffs2_ioctl,

	.unlocked_ioctl=jffs2_ioctl,

	.mmap =		generic_file_readonly_mmap,

	.fsync =	jffs2_fsync,

	.splice_read =	generic_file_splice_read,

fs/jffs2/ioctl.c

+1 −2
Original line number Diff line number Diff line
@@ -12,8 +12,7 @@ 
#include <linux/fs.h>

#include "nodelist.h"



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

		unsigned long arg)

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

{

	/* Later, this will provide for lsattr.jffs2 and chattr.jffs2, which

	   will include compression support etc. */

fs/jffs2/os-linux.h

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ int jffs2_fsync(struct file *, struct dentry *, int); 
int jffs2_do_readpage_unlock (struct inode *inode, struct page *pg);



/* ioctl.c */

int jffs2_ioctl(struct inode *, struct file *, unsigned int, unsigned long);

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



/* symlink.c */

extern const struct inode_operations jffs2_symlink_inode_operations;