From 0f17f934f19c9a088434722a3791eeb4ce314ca8 Mon Sep 17 00:00:00 2001
From: Ian Kent <raven@themaw.net>
Date: Tue, 7 Dec 2010 13:04:00 +0800
Subject: [PATCH] --- yaml --- r: 222975 b: refs/heads/master c:
 de47de7404e29df8de82f5822b4fde1a6ed97b54 h: refs/heads/master i:   222973:
 c1931757f136e89019cf126318cf45701bd989a1   222971:
 04f777d20b15d93872cfef6577858ada7a98e744   222967:
 6e7c62407d4f815b5132fce553fe4068841cf5b4   222959:
 f63f619e00db3989352122c576df309068897e64   222943:
 78de54d5cb44aadeb4054ff423cec9235f3f35bd   222911:
 57de753a07298b094362f6e2dfd071fa2e0749ad   222847:
 61c88f69670f24258bf08c082f272cab790e8dfe   222719:
 f858628c05c2cf2a7c4c3664ead73db24663958a v: v3

---
 [refs]                  |  2 +-
 trunk/fs/autofs4/root.c | 12 +-----------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 68dcb1ba94d3..479863fef4d4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cf7d7e5a1980d1116ee152d25dac382b112b9c17
+refs/heads/master: de47de7404e29df8de82f5822b4fde1a6ed97b54
diff --git a/trunk/fs/autofs4/root.c b/trunk/fs/autofs4/root.c
index d5c1401f0031..d34896cfb19f 100644
--- a/trunk/fs/autofs4/root.c
+++ b/trunk/fs/autofs4/root.c
@@ -980,19 +980,11 @@ static int autofs4_root_ioctl_unlocked(struct inode *inode, struct file *filp,
 	}
 }
 
-static DEFINE_MUTEX(autofs4_ioctl_mutex);
-
 static long autofs4_root_ioctl(struct file *filp,
 			       unsigned int cmd, unsigned long arg)
 {
-	long ret;
 	struct inode *inode = filp->f_dentry->d_inode;
-
-	mutex_lock(&autofs4_ioctl_mutex);
-	ret = autofs4_root_ioctl_unlocked(inode, filp, cmd, arg);
-	mutex_unlock(&autofs4_ioctl_mutex);
-
-	return ret;
+	return autofs4_root_ioctl_unlocked(inode, filp, cmd, arg);
 }
 
 #ifdef CONFIG_COMPAT
@@ -1002,13 +994,11 @@ static long autofs4_root_compat_ioctl(struct file *filp,
 	struct inode *inode = filp->f_path.dentry->d_inode;
 	int ret;
 
-	mutex_lock(&autofs4_ioctl_mutex);
 	if (cmd == AUTOFS_IOC_READY || cmd == AUTOFS_IOC_FAIL)
 		ret = autofs4_root_ioctl_unlocked(inode, filp, cmd, arg);
 	else
 		ret = autofs4_root_ioctl_unlocked(inode, filp, cmd,
 			(unsigned long)compat_ptr(arg));
-	mutex_unlock(&autofs4_ioctl_mutex);
 
 	return ret;
 }