From 54660032d35118d36ee94a7c8dbef889d51c6a8f Mon Sep 17 00:00:00 2001
From: Frederic Weisbecker <fweisbec@gmail.com>
Date: Wed, 14 Oct 2009 23:22:17 +0200
Subject: [PATCH] --- yaml --- r: 173183 b: refs/heads/master c:
 205cb37b89ab37db553907e5ac17962eec561804 h: refs/heads/master i:   173181:
 e8bfd2a486cb3f22913745e3198b2b1db5862b6d   173179:
 0b788f40acb653d06db4c65b3c00a622383b3a48   173175:
 9bafd82befae2459d5c67daaf64b9f8552731ea5   173167:
 9377baabaf32e98d311c6004dbc735d2b1ea1d85   173151:
 f83c724728620e20ba003ae22c93da2917bfdedd   173119:
 ec6fb4df3bc08e11b7f4285500b0886d14f644b7   173055:
 eb9301b082fe444cdb28a86c418eb8af59bbae0e v: v3

---
 [refs]                            |  2 +-
 trunk/fs/reiserfs/dir.c           |  2 +-
 trunk/fs/reiserfs/file.c          |  2 +-
 trunk/fs/reiserfs/ioctl.c         | 11 +++--------
 trunk/include/linux/reiserfs_fs.h |  3 +--
 5 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 703a5e61cc60..9887b03dc9a2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ac78a07893d24d95ff5f39d0433c25210f224f07
+refs/heads/master: 205cb37b89ab37db553907e5ac17962eec561804
diff --git a/trunk/fs/reiserfs/dir.c b/trunk/fs/reiserfs/dir.c
index 17f31ad379c8..c094f58c7448 100644
--- a/trunk/fs/reiserfs/dir.c
+++ b/trunk/fs/reiserfs/dir.c
@@ -20,7 +20,7 @@ const struct file_operations reiserfs_dir_operations = {
 	.read = generic_read_dir,
 	.readdir = reiserfs_readdir,
 	.fsync = reiserfs_dir_fsync,
-	.ioctl = reiserfs_ioctl,
+	.unlocked_ioctl = reiserfs_ioctl,
 #ifdef CONFIG_COMPAT
 	.compat_ioctl = reiserfs_compat_ioctl,
 #endif
diff --git a/trunk/fs/reiserfs/file.c b/trunk/fs/reiserfs/file.c
index 9f436668b7f8..da2dba082e2d 100644
--- a/trunk/fs/reiserfs/file.c
+++ b/trunk/fs/reiserfs/file.c
@@ -284,7 +284,7 @@ static ssize_t reiserfs_file_write(struct file *file,	/* the file we are going t
 const struct file_operations reiserfs_file_operations = {
 	.read = do_sync_read,
 	.write = reiserfs_file_write,
-	.ioctl = reiserfs_ioctl,
+	.unlocked_ioctl = reiserfs_ioctl,
 #ifdef CONFIG_COMPAT
 	.compat_ioctl = reiserfs_compat_ioctl,
 #endif
diff --git a/trunk/fs/reiserfs/ioctl.c b/trunk/fs/reiserfs/ioctl.c
index e30e8be09179..ace77451ceb1 100644
--- a/trunk/fs/reiserfs/ioctl.c
+++ b/trunk/fs/reiserfs/ioctl.c
@@ -20,9 +20,9 @@
  *  2) REISERFS_IOC_[GS]ETFLAGS, REISERFS_IOC_[GS]ETVERSION
  *  3) That's all for a while ...
  */
-int reiserfs_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
-		   unsigned long arg)
+long reiserfs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 {
+	struct inode *inode = filp->f_path.dentry->d_inode;
 	unsigned int flags;
 	int err = 0;
 
@@ -132,9 +132,6 @@ int reiserfs_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
 long reiserfs_compat_ioctl(struct file *file, unsigned int cmd,
 				unsigned long arg)
 {
-	struct inode *inode = file->f_path.dentry->d_inode;
-	int ret;
-
 	/* These are just misnamed, they actually get/put from/to user an int */
 	switch (cmd) {
 	case REISERFS_IOC32_UNPACK:
@@ -156,9 +153,7 @@ long reiserfs_compat_ioctl(struct file *file, unsigned int cmd,
 		return -ENOIOCTLCMD;
 	}
 
-	ret = reiserfs_ioctl(inode, file, cmd, (unsigned long) compat_ptr(arg));
-
-	return ret;
+	return reiserfs_ioctl(file, cmd, (unsigned long) compat_ptr(arg));
 }
 #endif
 
diff --git a/trunk/include/linux/reiserfs_fs.h b/trunk/include/linux/reiserfs_fs.h
index a498d9266d8c..a05b4a20768d 100644
--- a/trunk/include/linux/reiserfs_fs.h
+++ b/trunk/include/linux/reiserfs_fs.h
@@ -2314,8 +2314,7 @@ __u32 r5_hash(const signed char *msg, int len);
 #define SPARE_SPACE 500
 
 /* prototypes from ioctl.c */
-int reiserfs_ioctl(struct inode *inode, struct file *filp,
-		   unsigned int cmd, unsigned long arg);
+long reiserfs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg);
 long reiserfs_compat_ioctl(struct file *filp,
 		   unsigned int cmd, unsigned long arg);
 int reiserfs_unpack(struct inode *inode, struct file *filp);