vfs: Remove second variable named error in __dentry_path

In commit  232d2d60aa5469bb097f55728f65146bd49c1d25
Author: Waiman Long <[email protected]>
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: [email protected]
Cc: Waiman Long <[email protected]>
Signed-off-by: "Eric W. Biederman" <[email protected]>
Signed-off-by: Al Viro <[email protected]>

diff --git a/fs/dcache.c b/fs/dcache.c
index cb4a10690868263cb58e28012ee8f9abc4880da5..fdbe230278101eab9657d55f7137cb66e02f49fd 100644 (file)
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -3135,7 +3135,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);