Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 264135
b: refs/heads/master
c: 815d405
h: refs/heads/master
i:
  264133: 4cb5263
  264131: 0b55f60
  264127: 3bc0421
v: v3
  • Loading branch information
Trond Myklebust authored and Linus Torvalds committed Sep 27, 2011
1 parent 4a52e50 commit 3998a62
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d94c177beeb4469cd4f6e83354ab0223353e98ed
refs/heads/master: 815d405ceff0d6964683f033e18b9b23a88fba87
2 changes: 1 addition & 1 deletion trunk/fs/namespace.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/nfs/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/quota/quota.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 3998a62

Please sign in to comment.