diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2011-01-15 13:12:53 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-01-15 20:03:39 -0500 |
commit | 1a8edf40e7c3eee955e0dd0316a7c9d85e36f597 (patch) | |
tree | e9776058ac678d6f8b29429e77d2de58dcc83608 /fs/namei.c | |
parent | d73b388459b1ee2e80f8ff9c1916d75640d7d920 (diff) |
do_lookup() fix
do_lookup() has a path leading from LOOKUP_RCU case to non-RCU
crossing of mountpoints, which breaks things badly. If we
hit need_revalidate: and do nothing in there, we need to come
back into LOOKUP_RCU half of things, not to done: in non-RCU
one.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/namei.c')
-rw-r--r-- | fs/namei.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/namei.c b/fs/namei.c index 8df7a78ace58..529e917ad2fc 100644 --- a/fs/namei.c +++ b/fs/namei.c | |||
@@ -1089,6 +1089,7 @@ static int do_lookup(struct nameidata *nd, struct qstr *name, | |||
1089 | nd->seq = seq; | 1089 | nd->seq = seq; |
1090 | if (dentry->d_flags & DCACHE_OP_REVALIDATE) | 1090 | if (dentry->d_flags & DCACHE_OP_REVALIDATE) |
1091 | goto need_revalidate; | 1091 | goto need_revalidate; |
1092 | done2: | ||
1092 | path->mnt = mnt; | 1093 | path->mnt = mnt; |
1093 | path->dentry = dentry; | 1094 | path->dentry = dentry; |
1094 | __follow_mount_rcu(nd, path, inode); | 1095 | __follow_mount_rcu(nd, path, inode); |
@@ -1143,6 +1144,8 @@ need_revalidate: | |||
1143 | goto need_lookup; | 1144 | goto need_lookup; |
1144 | if (IS_ERR(dentry)) | 1145 | if (IS_ERR(dentry)) |
1145 | goto fail; | 1146 | goto fail; |
1147 | if (nd->flags & LOOKUP_RCU) | ||
1148 | goto done2; | ||
1146 | goto done; | 1149 | goto done; |
1147 | 1150 | ||
1148 | fail: | 1151 | fail: |