From a030c17811bde91a45c2a04d44a5da2df0a01d97 Mon Sep 17 00:00:00 2001
From: Stoyan Gaydarov <stoyboyker@gmail.com>
Date: Mon, 7 Jul 2008 07:45:59 -0500
Subject: [PATCH] --- yaml --- r: 106443 b: refs/heads/master c:
 0533400b7813df6c22a171499434d30bd57e799c h: refs/heads/master i:   106441:
 fd3cd5248129370249376d0b4adade3d804a0a9b   106439:
 bdf5d11106b45455738949fb12a293f7ec4c2914 v: v3

---
 [refs]                    | 2 +-
 trunk/fs/jffs2/dir.c      | 2 +-
 trunk/fs/jffs2/file.c     | 2 +-
 trunk/fs/jffs2/ioctl.c    | 3 +--
 trunk/fs/jffs2/os-linux.h | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index be2bea468acb..0a9736c94d0b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 36560d255b017dbcaefbf0f8fee7ad4dd1f0fe0a
+refs/heads/master: 0533400b7813df6c22a171499434d30bd57e799c
diff --git a/trunk/fs/jffs2/dir.c b/trunk/fs/jffs2/dir.c
index c0c141f6fde1..cd219ef55254 100644
--- a/trunk/fs/jffs2/dir.c
+++ b/trunk/fs/jffs2/dir.c
@@ -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
 };
 
diff --git a/trunk/fs/jffs2/file.c b/trunk/fs/jffs2/file.c
index 5e920343b2c5..5a98aa87c853 100644
--- a/trunk/fs/jffs2/file.c
+++ b/trunk/fs/jffs2/file.c
@@ -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,
diff --git a/trunk/fs/jffs2/ioctl.c b/trunk/fs/jffs2/ioctl.c
index e2177210f621..9d41f43e47bb 100644
--- a/trunk/fs/jffs2/ioctl.c
+++ b/trunk/fs/jffs2/ioctl.c
@@ -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. */
diff --git a/trunk/fs/jffs2/os-linux.h b/trunk/fs/jffs2/os-linux.h
index 2cc866cf134f..5e194a5c8e29 100644
--- a/trunk/fs/jffs2/os-linux.h
+++ b/trunk/fs/jffs2/os-linux.h
@@ -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;