Skip to contentSkip to conversation

ceph-fs: replace direct access of d_count with the d_count() helper

PATCH Superseded Waiman Long 1 participant 1 message Jul 5, 2013

Subsystems (2)

v5 of 7 Superseded Latest is v7 →

lore
Share & tools
lore
#0 lore raw

PATCH v5 5/12 ceph-fs: replace direct access of d_count with the d_count() helper

Because of the d_count change made in dcache.h, all readonly references to d_count have to be changed to use the new d_count() helper as they shouldn't access its value directly. There is no change in logic and everything should just work.

---
 fs/ceph/inode.c      |    4 ++--
 fs/ceph/mds_client.c |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
fs/ceph/inode.c +2 -2
index be0f7e2..bd2289a 100644
@@ -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, d_count(dn),
+		     realdn, d_count(realdn),
 		     realdn->d_inode, ceph_vinop(realdn->d_inode));
 		dput(dn);
 		dn = realdn;
fs/ceph/mds_client.c +1 -1
index 4d29203..8fd678f 100644
@@ -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, d_count(dentry), *base, len, path);
 	return path;
 }
 
Signature · 1 line
1.7.1