diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2014-01-20 15:43:25 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-06 11:22:19 -0800 |
| commit | 87df85def4003d893fe099c4011ecf1ee5c2582f (patch) | |
| tree | 0490da56736a78be03ec1545e8073e92239e2244 | |
| parent | 842408e7c7835d67c5eab0867fdd6b4676dc11bd (diff) | |
vfs: Remove second variable named error in __dentry_path
commit a8323da0366d3398eda62741d2ac1130c8a172ed upstream.
In commit 232d2d60aa5469bb097f55728f65146bd49c1d25
Author: Waiman Long <Waiman.Long@hp.com>
Date: Mon Sep 9 12:18:13 2013 -0400
dcache: Translating dentry into pathname without taking rename_lock
The __dentry_path locking was changed and the variable error was
intended to be moved outside of the loop. Unfortunately the inner
declaration of error was not removed. Resulting in a version of
__dentry_path that will never return an error.
Remove the problematic inner declaration of error and allow
__dentry_path to return errors once again.
Cc: Waiman Long <Waiman.Long@hp.com>
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | fs/dcache.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/dcache.c b/fs/dcache.c index f27c1d12a1f..4021e017260 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -3140,7 +3140,6 @@ restart: read_seqbegin_or_lock(&rename_lock, &seq); while (!IS_ROOT(dentry)) { struct dentry *parent = dentry->d_parent; - int error; prefetch(parent); error = prepend_name(&end, &len, &dentry->d_name); |