Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84d08fa8 authored by Al Viro's avatar Al Viro
Browse files

helper for reading ->d_count 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 74b9272b

drivers/staging/lustre/lustre/include/linux/lustre_patchless_compat.h

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ truncate_complete_page(struct address_space *mapping, struct page *page) 
	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

fs/autofs4/expire.c

+4 −4
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ cont: 


	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 @@ static int autofs4_tree_busy(struct vfsmount *mnt, 
			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 @@ struct dentry *autofs4_expire_indirect(struct super_block *sb, 
		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 @@ struct dentry *autofs4_expire_indirect(struct super_block *sb, 
		} 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);

fs/autofs4/root.c

+1 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ static struct dentry *autofs4_lookup_active(struct dentry *dentry) 
		spin_lock(&active->d_lock);



		/* Already gone? */

		if (active->d_count == 0)

		if (!d_count(active))

			goto next;



		qstr = &active->d_name;

fs/ceph/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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;

}