diff options
author | Ingo Molnar <mingo@elte.hu> | 2011-10-06 14:48:57 +0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-10-06 14:49:21 +0400 |
commit | 9d014020234525ae100879d71078a4bcb4849195 (patch) | |
tree | a0d6c0776670cb876e5a8118a4e6ed28d8f51cbc /fs/stat.c | |
parent | 92e51938f5d005026ba4bb5b1fae5a86dc195b86 (diff) | |
parent | 976d167615b64e14bc1491ca51d424e2ba9a5e84 (diff) | |
download | linux-9d014020234525ae100879d71078a4bcb4849195.tar.xz |
Merge commit 'v3.1-rc9' into perf/core
Merge reason: pick up latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/stat.c')
-rw-r--r-- | fs/stat.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/stat.c b/fs/stat.c index ba5316ffac61..78a3aa83c7ea 100644 --- a/fs/stat.c +++ b/fs/stat.c @@ -81,8 +81,6 @@ int vfs_fstatat(int dfd, const char __user *filename, struct kstat *stat, if (!(flag & AT_SYMLINK_NOFOLLOW)) lookup_flags |= LOOKUP_FOLLOW; - if (flag & AT_NO_AUTOMOUNT) - lookup_flags |= LOOKUP_NO_AUTOMOUNT; if (flag & AT_EMPTY_PATH) lookup_flags |= LOOKUP_EMPTY; |