From 3998a62b20aebfe6caaea0ea30d3187cddace9da Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Mon, 26 Sep 2011 20:36:09 -0400
Subject: [PATCH] --- yaml --- r: 264135 b: refs/heads/master c:
 815d405ceff0d6964683f033e18b9b23a88fba87 h: refs/heads/master i:   264133:
 4cb52637f0930280949f83b656b14156316abd53   264131:
 0b55f602dca6049a2b802dd7fbba28776865fd01   264127:
 3bc04219f909fc9701ab83a3a3d19f8433ecda58 v: v3

---
 [refs]                 | 2 +-
 trunk/fs/namespace.c   | 2 +-
 trunk/fs/nfs/super.c   | 2 +-
 trunk/fs/quota/quota.c | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 145902c05126..2884008c3822 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d94c177beeb4469cd4f6e83354ab0223353e98ed
+refs/heads/master: 815d405ceff0d6964683f033e18b9b23a88fba87
diff --git a/trunk/fs/namespace.c b/trunk/fs/namespace.c
index 22bfe8273c68..b4febb29d3bb 100644
--- a/trunk/fs/namespace.c
+++ b/trunk/fs/namespace.c
@@ -1757,7 +1757,7 @@ static int do_loopback(struct path *path, char *old_name,
 		return err;
 	if (!old_name || !*old_name)
 		return -EINVAL;
-	err = kern_path(old_name, LOOKUP_FOLLOW, &old_path);
+	err = kern_path(old_name, LOOKUP_FOLLOW|LOOKUP_AUTOMOUNT, &old_path);
 	if (err)
 		return err;
 
diff --git a/trunk/fs/nfs/super.c b/trunk/fs/nfs/super.c
index 9b7dd7013b15..5b19b6aabe18 100644
--- a/trunk/fs/nfs/super.c
+++ b/trunk/fs/nfs/super.c
@@ -2798,7 +2798,7 @@ static struct dentry *nfs_follow_remote_path(struct vfsmount *root_mnt,
 		goto out_put_mnt_ns;
 
 	ret = vfs_path_lookup(root_mnt->mnt_root, root_mnt,
-			export_path, LOOKUP_FOLLOW, &path);
+			export_path, LOOKUP_FOLLOW|LOOKUP_AUTOMOUNT, &path);
 
 	nfs_referral_loop_unprotect();
 	put_mnt_ns(ns_private);
diff --git a/trunk/fs/quota/quota.c b/trunk/fs/quota/quota.c
index b34bdb25490c..10b6be3ca280 100644
--- a/trunk/fs/quota/quota.c
+++ b/trunk/fs/quota/quota.c
@@ -355,7 +355,7 @@ SYSCALL_DEFINE4(quotactl, unsigned int, cmd, const char __user *, special,
 	 * resolution (think about autofs) and thus deadlocks could arise.
 	 */
 	if (cmds == Q_QUOTAON) {
-		ret = user_path_at(AT_FDCWD, addr, LOOKUP_FOLLOW, &path);
+		ret = user_path_at(AT_FDCWD, addr, LOOKUP_FOLLOW|LOOKUP_AUTOMOUNT, &path);
 		if (ret)
 			pathp = ERR_PTR(ret);
 		else