diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2011-03-09 01:34:45 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-03-14 09:15:27 -0400 |
commit | f374ed5fa8afed8590deaae5dc147422e0e1a6d9 (patch) | |
tree | 76bf116e7a8c75be60734527dd804632dee8a95b | |
parent | 6c0d46c493217cf48999b3f8808910ae534aa085 (diff) |
do_last: kill a rudiment of old ->d_revalidate() workaround
There used to be time when ->d_revalidate() couldn't return an error.
So intents code had lookup_instantiate_filp() stash ERR_PTR(error)
in nd->intent.open.filp and had it checked after lookup_hash(), to
catch the otherwise silent failures. That had been introduced by
commit 4af4c52f34606bdaab6930a845550c6fb02078a4. These days
->d_revalidate() can and does propagate errors back to callers
explicitly, so this check isn't needed anymore.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r-- | fs/namei.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/fs/namei.c b/fs/namei.c index 441f1106de08..6972e761286b 100644 --- a/fs/namei.c +++ b/fs/namei.c | |||
@@ -2183,11 +2183,6 @@ static struct file *do_last(struct nameidata *nd, struct path *path, | |||
2183 | path->dentry = dentry; | 2183 | path->dentry = dentry; |
2184 | path->mnt = nd->path.mnt; | 2184 | path->mnt = nd->path.mnt; |
2185 | 2185 | ||
2186 | if (IS_ERR(nd->intent.open.file)) { | ||
2187 | error = PTR_ERR(nd->intent.open.file); | ||
2188 | goto exit_mutex_unlock; | ||
2189 | } | ||
2190 | |||
2191 | /* Negative dentry, just create the file */ | 2186 | /* Negative dentry, just create the file */ |
2192 | if (!dentry->d_inode) { | 2187 | if (!dentry->d_inode) { |
2193 | int mode = op->mode; | 2188 | int mode = op->mode; |