From 4a52e501a29408227d43778ae19c504679a09a1e Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Mon, 26 Sep 2011 17:44:55 -0700 Subject: [PATCH] --- yaml --- r: 264134 b: refs/heads/master c: d94c177beeb4469cd4f6e83354ab0223353e98ed h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/namei.c | 2 +- trunk/include/linux/namei.h | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 79ca61248676..145902c05126 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 858b1814b89d043a3866299c258ccdc27eb2538c +refs/heads/master: d94c177beeb4469cd4f6e83354ab0223353e98ed diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c index f4788365ea22..09606fd83d57 100644 --- a/trunk/fs/namei.c +++ b/trunk/fs/namei.c @@ -739,7 +739,7 @@ static int follow_automount(struct path *path, unsigned flags, * of the daemon to instantiate them before they can be used. */ if (!(flags & (LOOKUP_PARENT | LOOKUP_DIRECTORY | - LOOKUP_OPEN | LOOKUP_CREATE)) && + LOOKUP_OPEN | LOOKUP_CREATE | LOOKUP_AUTOMOUNT)) && path->dentry->d_inode) return -EISDIR; diff --git a/trunk/include/linux/namei.h b/trunk/include/linux/namei.h index 76fe2c62ae71..e13dac7caab2 100644 --- a/trunk/include/linux/namei.h +++ b/trunk/include/linux/namei.h @@ -48,6 +48,7 @@ enum {LAST_NORM, LAST_ROOT, LAST_DOT, LAST_DOTDOT, LAST_BIND}; */ #define LOOKUP_FOLLOW 0x0001 #define LOOKUP_DIRECTORY 0x0002 +#define LOOKUP_AUTOMOUNT 0x0004 #define LOOKUP_PARENT 0x0010 #define LOOKUP_REVAL 0x0020