autofs4 - remove ioctl mutex (bz23142) (de47de74) · Commits · 戴 / test

With the recent changes to remove the BKL a mutex was added to the ioctl entry point for calls to the old ioctl interface. This mutex needs to be removed because of the need for the expire ioctl to call back to the daemon to perform a umount and receive a completion status (via another ioctl). This should be fine as the new ioctl interface uses much of the same code and it has been used without a mutex for around a year without issue, as was the original intention. Ref: Bugzilla bug 23142 Signed-off-by:

Ian Kent <raven@themaw.net> Acked-by:

Arnd Bergmann <arnd@arndb.de> Signed-off-by:

Linus Torvalds <torvalds@linux-foundation.org>

fs/autofs4/root.c

+1 −11

Original line number	Diff line number	Diff line
		@@ -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;
		}

Admin message