helper for reading ->d_count

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

helper for reading ->d_count
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Al Viro
1 parent 74b9272bbe
Showing 12 changed files with 22 additions and 17 deletions Side-by-side Diff
drivers/staging/lustre/lustre/include/linux/lustre_patchless_compat.h
fs/autofs4/expire.c
fs/autofs4/root.c
fs/ceph/inode.c
fs/ceph/mds_client.c
fs/coda/dir.c
fs/ecryptfs/inode.c
fs/locks.c
fs/nfs/dir.c
fs/nfs/unlink.c
fs/nilfs2/super.c
include/linux/dcache.h
@@ -60,7 +60,7 @@
 	ll_delete_from_page_cache(page);
 }
  
-#  define d_refcount(d)		 ((d)->d_count)
+#  define d_refcount(d)		 d_count(d)
  
 #ifdef ATTR_OPEN
 # define ATTR_FROM_OPEN ATTR_OPEN
@@ -109,7 +109,7 @@
  
 	spin_lock_nested(&q->d_lock, DENTRY_D_LOCK_NESTED);
 	/* Already gone or negative dentry (under construction) - try next */
-	if (q->d_count == 0 || !simple_positive(q)) {
+	if (!d_count(q) || !simple_positive(q)) {
 		spin_unlock(&q->d_lock);
 		next = q->d_u.d_child.next;
 		goto cont;
@@ -267,7 +267,7 @@
 			else
 				ino_count++;
  
-			if (p->d_count > ino_count) {
+			if (d_count(p) > ino_count) {
 				top_ino->last_used = jiffies;
 				dput(p);
 				return 1;
@@ -409,7 +409,7 @@
 		if (!exp_leaves) {
 			/* Path walk currently on this dentry? */
 			ino_count = atomic_read(&ino->count) + 1;
-			if (dentry->d_count > ino_count)
+			if (d_count(dentry) > ino_count)
 				goto next;
  
 			if (!autofs4_tree_busy(mnt, dentry, timeout, do_now)) {
@@ -423,7 +423,7 @@
 		} else {
 			/* Path walk currently on this dentry? */
 			ino_count = atomic_read(&ino->count) + 1;
-			if (dentry->d_count > ino_count)
+			if (d_count(dentry) > ino_count)
 				goto next;
  
 			expired = autofs4_check_leaves(mnt, dentry, timeout, do_now);
@@ -179,7 +179,7 @@
 		spin_lock(&active->d_lock);
  
 		/* Already gone? */
-		if (active->d_count == 0)
+		if (!d_count(active))
 			goto next;
  
 		qstr = &active->d_name;
@@ -903,8 +903,8 @@
 	} 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;
@@ -1553,7 +1553,7 @@
 	*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;
 }
  
@@ -526,7 +526,7 @@
 	if (cii->c_flags & C_FLUSH) 
 		coda_flag_inode_children(inode, C_FLUSH);
  
-	if (de->d_count > 1)
+	if (d_count(de) > 1)
 		/* pretend it's valid, but don't change the flags */
 		goto out;
  
@@ -358,7 +358,7 @@
  
 	lower_mnt = mntget(ecryptfs_dentry_to_lower_mnt(dentry->d_parent));
 	fsstack_copy_attr_atime(dir_inode, lower_dentry->d_parent->d_inode);
-	BUG_ON(!lower_dentry->d_count);
+	BUG_ON(!d_count(lower_dentry));
  
 	ecryptfs_set_dentry_private(dentry, dentry_info);
 	ecryptfs_set_dentry_lower(dentry, lower_dentry);
@@ -1454,7 +1454,7 @@
 	if ((arg == F_RDLCK) && (atomic_read(&inode->i_writecount) > 0))
 		goto out;
 	if ((arg == F_WRLCK)
-	    && ((dentry->d_count > 1)
+	    && ((d_count(dentry) > 1)
 		|| (atomic_read(&inode->i_count) > 1)))
 		goto out;
  
@@ -1721,7 +1721,7 @@
 		dir->i_ino, dentry->d_name.name);
  
 	spin_lock(&dentry->d_lock);
-	if (dentry->d_count > 1) {
+	if (d_count(dentry) > 1) {
 		spin_unlock(&dentry->d_lock);
 		/* Start asynchronous writeout of the inode */
 		write_inode_now(dentry->d_inode, 0);
@@ -1866,7 +1866,7 @@
 	dfprintk(VFS, "NFS: rename(%s/%s -> %s/%s, ct=%d)\n",
 		 old_dentry->d_parent->d_name.name, old_dentry->d_name.name,
 		 new_dentry->d_parent->d_name.name, new_dentry->d_name.name,
-		 new_dentry->d_count);
+		 d_count(new_dentry));
  
 	/*
 	 * For non-directories, check whether the target is busy and if so,
@@ -1884,7 +1884,7 @@
 			rehash = new_dentry;
 		}
  
-		if (new_dentry->d_count > 2) {
+		if (d_count(new_dentry) > 2) {
 			int err;
  
 			/* copy the target dentry's name */
@@ -479,7 +479,7 @@
  
 	dfprintk(VFS, "NFS: silly-rename(%s/%s, ct=%d)\n",
 		dentry->d_parent->d_name.name, dentry->d_name.name,
-		dentry->d_count);
+		d_count(dentry));
 	nfs_inc_stats(dir, NFSIOS_SILLYRENAME);
  
 	/*
@@ -996,7 +996,7 @@
  
 static int nilfs_tree_was_touched(struct dentry *root_dentry)
 {
-	return root_dentry->d_count > 1;
+	return d_count(root_dentry) > 1;
 }
  
 /**
@@ -324,6 +324,11 @@
 	return ret;
 }
  
+static inline unsigned d_count(struct dentry *dentry)
+{
+	return dentry->d_count;
+}
+
 /* validate "insecure" dentry pointer */
 extern int d_validate(struct dentry *, struct dentry *);
...	...	@@ -60,7 +60,7 @@
60	60	ll_delete_from_page_cache(page);
61	61	}
62	62
63		-# define d_refcount(d) ((d)->d_count)
	63	+# define d_refcount(d) d_count(d)
64	64
65	65	#ifdef ATTR_OPEN
66	66	# define ATTR_FROM_OPEN ATTR_OPEN
...	...	@@ -109,7 +109,7 @@
109	109
110	110	spin_lock_nested(&q->d_lock, DENTRY_D_LOCK_NESTED);
111	111	/* Already gone or negative dentry (under construction) - try next */
112		- if (q->d_count == 0 \|\| !simple_positive(q)) {
	112	+ if (!d_count(q) \|\| !simple_positive(q)) {
113	113	spin_unlock(&q->d_lock);
114	114	next = q->d_u.d_child.next;
115	115	goto cont;
...	...	@@ -267,7 +267,7 @@
267	267	else
268	268	ino_count++;
269	269
270		- if (p->d_count > ino_count) {
	270	+ if (d_count(p) > ino_count) {
271	271	top_ino->last_used = jiffies;
272	272	dput(p);
273	273	return 1;
...	...	@@ -409,7 +409,7 @@
409	409	if (!exp_leaves) {
410	410	/* Path walk currently on this dentry? */
411	411	ino_count = atomic_read(&ino->count) + 1;
412		- if (dentry->d_count > ino_count)
	412	+ if (d_count(dentry) > ino_count)
413	413	goto next;
414	414
415	415	if (!autofs4_tree_busy(mnt, dentry, timeout, do_now)) {
...	...	@@ -423,7 +423,7 @@
423	423	} else {
424	424	/* Path walk currently on this dentry? */
425	425	ino_count = atomic_read(&ino->count) + 1;
426		- if (dentry->d_count > ino_count)
	426	+ if (d_count(dentry) > ino_count)
427	427	goto next;
428	428
429	429	expired = autofs4_check_leaves(mnt, dentry, timeout, do_now);
...	...	@@ -179,7 +179,7 @@
179	179	spin_lock(&active->d_lock);
180	180
181	181	/* Already gone? */
182		- if (active->d_count == 0)
	182	+ if (!d_count(active))
183	183	goto next;
184	184
185	185	qstr = &active->d_name;
...	...	@@ -903,8 +903,8 @@
903	903	} else if (realdn) {
904	904	dout("dn %p (%d) spliced with %p (%d) "
905	905	"inode %p ino %llx.%llx\n",
906		- dn, dn->d_count,
907		- realdn, realdn->d_count,
	906	+ dn, d_count(dn),
	907	+ realdn, d_count(realdn),
908	908	realdn->d_inode, ceph_vinop(realdn->d_inode));
909	909	dput(dn);
910	910	dn = realdn;
...	...	@@ -1553,7 +1553,7 @@
1553	1553	*base = ceph_ino(temp->d_inode);
1554	1554	*plen = len;
1555	1555	dout("build_path on %p %d built %llx '%.*s'\n",
1556		- dentry, dentry->d_count, *base, len, path);
	1556	+ dentry, d_count(dentry), *base, len, path);
1557	1557	return path;
1558	1558	}
1559	1559
...	...	@@ -526,7 +526,7 @@
526	526	if (cii->c_flags & C_FLUSH)
527	527	coda_flag_inode_children(inode, C_FLUSH);
528	528
529		- if (de->d_count > 1)
	529	+ if (d_count(de) > 1)
530	530	/* pretend it's valid, but don't change the flags */
531	531	goto out;
532	532
...	...	@@ -358,7 +358,7 @@
358	358
359	359	lower_mnt = mntget(ecryptfs_dentry_to_lower_mnt(dentry->d_parent));
360	360	fsstack_copy_attr_atime(dir_inode, lower_dentry->d_parent->d_inode);
361		- BUG_ON(!lower_dentry->d_count);
	361	+ BUG_ON(!d_count(lower_dentry));
362	362
363	363	ecryptfs_set_dentry_private(dentry, dentry_info);
364	364	ecryptfs_set_dentry_lower(dentry, lower_dentry);
...	...	@@ -1454,7 +1454,7 @@
1454	1454	if ((arg == F_RDLCK) && (atomic_read(&inode->i_writecount) > 0))
1455	1455	goto out;
1456	1456	if ((arg == F_WRLCK)
1457		- && ((dentry->d_count > 1)
	1457	+ && ((d_count(dentry) > 1)
1458	1458	\|\| (atomic_read(&inode->i_count) > 1)))
1459	1459	goto out;
1460	1460
...	...	@@ -1721,7 +1721,7 @@
1721	1721	dir->i_ino, dentry->d_name.name);
1722	1722
1723	1723	spin_lock(&dentry->d_lock);
1724		- if (dentry->d_count > 1) {
	1724	+ if (d_count(dentry) > 1) {
1725	1725	spin_unlock(&dentry->d_lock);
1726	1726	/* Start asynchronous writeout of the inode */
1727	1727	write_inode_now(dentry->d_inode, 0);
...	...	@@ -1866,7 +1866,7 @@
1866	1866	dfprintk(VFS, "NFS: rename(%s/%s -> %s/%s, ct=%d)\n",
1867	1867	old_dentry->d_parent->d_name.name, old_dentry->d_name.name,
1868	1868	new_dentry->d_parent->d_name.name, new_dentry->d_name.name,
1869		- new_dentry->d_count);
	1869	+ d_count(new_dentry));
1870	1870
1871	1871	/*
1872	1872	* For non-directories, check whether the target is busy and if so,
...	...	@@ -1884,7 +1884,7 @@
1884	1884	rehash = new_dentry;
1885	1885	}
1886	1886
1887		- if (new_dentry->d_count > 2) {
	1887	+ if (d_count(new_dentry) > 2) {
1888	1888	int err;
1889	1889
1890	1890	/* copy the target dentry's name */
...	...	@@ -479,7 +479,7 @@
479	479
480	480	dfprintk(VFS, "NFS: silly-rename(%s/%s, ct=%d)\n",
481	481	dentry->d_parent->d_name.name, dentry->d_name.name,
482		- dentry->d_count);
	482	+ d_count(dentry));
483	483	nfs_inc_stats(dir, NFSIOS_SILLYRENAME);
484	484
485	485	/*