From db7d75687184467e6ed33c3f25d600d642e9f7ba Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Tue, 29 Apr 2008 22:03:54 -0400
Subject: [PATCH] --- yaml --- r: 95035 b: refs/heads/master c:
 5cdd7b2d7716a7ed7d6dc7588e2d015f04d46640 h: refs/heads/master i:   95033:
 e1dd04080daaf43356204923365dfb102924f6e8   95031:
 fdeec2fb28687758a62485e7ae8042eb3ff2b2f8 v: v3

---
 [refs]                        |  2 +-
 trunk/fs/ext4/dir.c           |  2 +-
 trunk/fs/ext4/file.c          |  2 +-
 trunk/fs/ext4/ioctl.c         | 12 +++---------
 trunk/include/linux/ext4_fs.h |  3 +--
 5 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 7c52fa6391fb..d601636a7562 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 161e7b7c1d24112d188df9a7b30d468a8d135b96
+refs/heads/master: 5cdd7b2d7716a7ed7d6dc7588e2d015f04d46640
diff --git a/trunk/fs/ext4/dir.c b/trunk/fs/ext4/dir.c
index 2c23bade9aa6..88c97f7312be 100644
--- a/trunk/fs/ext4/dir.c
+++ b/trunk/fs/ext4/dir.c
@@ -42,7 +42,7 @@ const struct file_operations ext4_dir_operations = {
 	.llseek		= generic_file_llseek,
 	.read		= generic_read_dir,
 	.readdir	= ext4_readdir,		/* we take BKL. needed?*/
-	.ioctl		= ext4_ioctl,		/* BKL held */
+	.unlocked_ioctl = ext4_ioctl,
 #ifdef CONFIG_COMPAT
 	.compat_ioctl	= ext4_compat_ioctl,
 #endif
diff --git a/trunk/fs/ext4/file.c b/trunk/fs/ext4/file.c
index ac35ec58db55..20507a24506a 100644
--- a/trunk/fs/ext4/file.c
+++ b/trunk/fs/ext4/file.c
@@ -129,7 +129,7 @@ const struct file_operations ext4_file_operations = {
 	.write		= do_sync_write,
 	.aio_read	= generic_file_aio_read,
 	.aio_write	= ext4_file_write,
-	.ioctl		= ext4_ioctl,
+	.unlocked_ioctl = ext4_ioctl,
 #ifdef CONFIG_COMPAT
 	.compat_ioctl	= ext4_compat_ioctl,
 #endif
diff --git a/trunk/fs/ext4/ioctl.c b/trunk/fs/ext4/ioctl.c
index 25b13ede8086..ce937fe432a0 100644
--- a/trunk/fs/ext4/ioctl.c
+++ b/trunk/fs/ext4/ioctl.c
@@ -18,9 +18,9 @@
 #include <linux/mount.h>
 #include <asm/uaccess.h>
 
-int ext4_ioctl (struct inode * inode, struct file * filp, unsigned int cmd,
-		unsigned long arg)
+long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 {
+	struct inode *inode = filp->f_dentry->d_inode;
 	struct ext4_inode_info *ei = EXT4_I(inode);
 	unsigned int flags;
 	unsigned short rsv_window_size;
@@ -277,9 +277,6 @@ int ext4_ioctl (struct inode * inode, struct file * filp, unsigned int cmd,
 #ifdef CONFIG_COMPAT
 long ext4_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 EXT4_IOC32_GETFLAGS:
@@ -319,9 +316,6 @@ long ext4_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 	default:
 		return -ENOIOCTLCMD;
 	}
-	lock_kernel();
-	ret = ext4_ioctl(inode, file, cmd, (unsigned long) compat_ptr(arg));
-	unlock_kernel();
-	return ret;
+	return ext4_ioctl(file, cmd, (unsigned long) compat_ptr(arg));
 }
 #endif
diff --git a/trunk/include/linux/ext4_fs.h b/trunk/include/linux/ext4_fs.h
index 105337ca9ed0..33bc88568c54 100644
--- a/trunk/include/linux/ext4_fs.h
+++ b/trunk/include/linux/ext4_fs.h
@@ -1050,8 +1050,7 @@ extern int ext4_block_truncate_page(handle_t *handle, struct page *page,
 		struct address_space *mapping, loff_t from);
 
 /* ioctl.c */
-extern int ext4_ioctl (struct inode *, struct file *, unsigned int,
-		       unsigned long);
+extern long ext4_ioctl(struct file *, unsigned int, unsigned long);
 extern long ext4_compat_ioctl (struct file *, unsigned int, unsigned long);
 
 /* migrate.c */