From patchwork Thu Nov 27 11:41:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Bader X-Patchwork-Id: 415460 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id E270A1401B5; Thu, 27 Nov 2014 22:41:51 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1XtxSH-0007fP-3a; Thu, 27 Nov 2014 11:41:49 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1XtxS7-0007dp-E1 for kernel-team@lists.ubuntu.com; Thu, 27 Nov 2014 11:41:39 +0000 Received: from hsi-kbw-109-193-156-102.hsi7.kabel-badenwuerttemberg.de ([109.193.156.102] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1XtxS7-00024G-Aw; Thu, 27 Nov 2014 11:41:39 +0000 From: Stefan Bader To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/2] fold swapping ->d_name.hash into switch_names() Date: Thu, 27 Nov 2014 12:41:37 +0100 Message-Id: <1417088498-13376-2-git-send-email-stefan.bader@canonical.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1417088498-13376-1-git-send-email-stefan.bader@canonical.com> References: <1417088498-13376-1-git-send-email-stefan.bader@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com From: Linus Torvalds and do it along with ->d_name.len there Signed-off-by: Linus Torvalds Signed-off-by: Al Viro BugLink: http://bugs.launchpad.net/bugs/1396907 (backported from commit a28ddb87cdddb0db57466ba7f59f831002f4340c upstream) Signed-off-by: Stefan Bader --- fs/dcache.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/fs/dcache.c b/fs/dcache.c index e1308c5..2327108 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -2441,7 +2441,7 @@ static void switch_names(struct dentry *dentry, struct dentry *target) } } } - swap(dentry->d_name.len, target->d_name.len); + swap(dentry->d_name.hash_len, target->d_name.hash_len); } static void dentry_lock_for_move(struct dentry *dentry, struct dentry *target) @@ -2540,7 +2540,6 @@ static void __d_move(struct dentry *dentry, struct dentry *target, /* Switch the names.. */ switch_names(dentry, target); - swap(dentry->d_name.hash, target->d_name.hash); /* ... and switch the parents */ if (IS_ROOT(dentry)) { @@ -2679,7 +2678,6 @@ static void __d_materialise_dentry(struct dentry *dentry, struct dentry *anon) dparent = dentry->d_parent; switch_names(dentry, anon); - swap(dentry->d_name.hash, anon->d_name.hash); dentry->d_parent = dentry; list_del_init(&dentry->d_u.d_child);