From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933614Ab3GDDeD (ORCPT ); Wed, 3 Jul 2013 23:34:03 -0400 Received: from g6t0185.atlanta.hp.com ([15.193.32.62]:37117 "EHLO g6t0185.atlanta.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933001Ab3GDDeA (ORCPT ); Wed, 3 Jul 2013 23:34:00 -0400 From: Waiman Long Cc: Sage Weil , ceph-devel@vger.kernel.org, Waiman Long , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Peter Zijlstra , Steven Rostedt , Linus Torvalds , Benjamin Herrenschmidt , Andi Kleen , "Chandramouleeswaran, Aswin" , "Norton, Scott J" Subject: [PATCH v4 05/12] ceph-fs: rename d_count field of dentry to d_refcount Date: Wed, 3 Jul 2013 23:33:44 -0400 Message-Id: <1372908824-33341-1-git-send-email-Waiman.Long@hp.com> X-Mailer: git-send-email 1.7.1 To: Alexander Viro , Jeff Layton , Miklos Szeredi , Ingo Molnar , Thomas Gleixner Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Because of the d_count name change made in dcache.h, all references to d_count have to be changed to d_refcount. There is no change in logic and everything should just work. Signed-off-by: Waiman Long --- fs/ceph/inode.c | 4 ++-- fs/ceph/mds_client.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c index be0f7e2..6eaa286 100644 --- a/fs/ceph/inode.c +++ b/fs/ceph/inode.c @@ -903,8 +903,8 @@ static struct dentry *splice_dentry(struct dentry *dn, struct inode *in, } else if (realdn) { dout("dn %p (%d) spliced with %p (%d) " "inode %p ino %llx.%llx\n", - dn, dn->d_count, - realdn, realdn->d_count, + dn, dn->d_refcount, + realdn, realdn->d_refcount, realdn->d_inode, ceph_vinop(realdn->d_inode)); dput(dn); dn = realdn; diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c index 4d29203..4937556 100644 --- a/fs/ceph/mds_client.c +++ b/fs/ceph/mds_client.c @@ -1553,7 +1553,7 @@ retry: *base = ceph_ino(temp->d_inode); *plen = len; dout("build_path on %p %d built %llx '%.*s'\n", - dentry, dentry->d_count, *base, len, path); + dentry, dentry->d_refcount, *base, len, path); return path; } -- 1.7.1