From mboxrd@z Thu Jan 1 00:00:00 1970 From: ebiederm@xmission.com (Eric W. Biederman) Subject: [PATCH] vfs: Remove second variable named error in __dentry_path Date: Mon, 20 Jan 2014 15:43:25 -0800 Message-ID: <87fvoi6wyq.fsf@xmission.com> Mime-Version: 1.0 Content-Type: text/plain Cc: , , Waiman Long To: Al Viro Return-path: Received: from out01.mta.xmission.com ([166.70.13.231]:53338 "EHLO out01.mta.xmission.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751937AbaATXng (ORCPT ); Mon, 20 Jan 2014 18:43:36 -0500 Sender: linux-fsdevel-owner@vger.kernel.org List-ID: In commit 232d2d60aa5469bb097f55728f65146bd49c1d25 Author: Waiman Long 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 Signed-off-by: "Eric W. Biederman" --- fs/dcache.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/fs/dcache.c b/fs/dcache.c index cb4a10690868..fdbe23027810 100644 --- 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); -- 1.7.5.4