[Devel] [PATCH RHEL7 COMMIT] ms/vfs: Remove second variable named error in __dentry_path

[Konstantin Khorenko]

The commit is pushed to "branch-rh7-3.10.0-123.1.2-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-123.1.2.vz7.5.14
------>
commit 2b7a3a746bf3b707394c4fe4223cfe1448bda87a
Author: Pavel Tikhomirov <ptikhomirov at virtuozzo.com>
Date:   Thu Jun 18 17:00:12 2015 +0400

    ms/vfs: Remove second variable named error in __dentry_path
    
    Patchset description:
    
    port fixes from mainstream to fix fails from getcwd04 test,
    now it pass:
    
      ./third/ltp/testcases/kernel/syscalls/getcwd/getcwd04
      getcwd04    1  TPASS  :  Bug is not reproduced!
    
    https://jira.sw.ru/browse/PSBM-34245
    
    Al Viro (2):
      prepend_path() needs to reinitialize dentry/vfsmount/mnt on restarts
      __dentry_path() fixes
    
    Eric W. Biederman (1):
      vfs: Remove second variable named error in __dentry_path
    
    Pavel Tikhomirov (1):
      dcache: reinitialize error for resetart in prepend_path as in ms
    
    ##################################################################
    This patch description:
    
    From: "Eric W. Biederman" <ebiederm at xmission.com>
    
    Port mainstream patch:
    
      commit a8323da0366d3398eda62741d2ac1130c8a172ed
      Author: Eric W. Biederman <ebiederm at xmission.com>
      Date:   Mon Jan 20 15:43:25 2014 -0800
    
          vfs: Remove second variable named error in __dentry_path
    
          In commit  232d2d60aa5469bb097f55728f65146bd49c1d25
          Author: Waiman Long <Waiman.Long at 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 at vger.kernel.org
          Cc: Waiman Long <Waiman.Long at hp.com>
          Signed-off-by: "Eric W. Biederman" <ebiederm at xmission.com>
          Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
    
    Signed-off-by: Pavel Tikhomirov <ptikhomirov at virtuozzo.com>
    Reviewed-by: Vladimir Davydov <vdavydov at parallels.com>
---
 fs/dcache.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/fs/dcache.c b/fs/dcache.c
index ad4acc4..da460df 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -3121,7 +3121,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);