Commit a8323da0 authored Jan 20, 2014 by Eric W. Biederman Committed by Al Viro Jan 26, 2014

vfs: Remove second variable named error in __dentry_path



In commit  232d2d60
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: stable@vger.kernel.org
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>

parent 260a459d

fs/dcache.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -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);

Admin message