Commit b48dbb99 authored by Dominique Martinet's avatar Dominique Martinet Committed by Dominique Martinet
Browse files

9p fid refcount: add p9_fid_get/put wrappers 

I was recently reminded that it is not clear that p9_client_clunk()
was actually just decrementing refcount and clunking only when that
reaches zero: make it clear through a set of helpers.

This will also allow instrumenting refcounting better for debugging
next patch

Link: https://lkml.kernel.org/r/20220612085330.1451496-5-asmadeus@codewreck.org


Reviewed-by: default avatarTyler Hicks <tyhicks@linux.microsoft.com>
Reviewed-by: default avatarChristian Schoenebeck <linux_oss@crudebyte.com>
Signed-off-by: default avatarDominique Martinet <asmadeus@codewreck.org>
parent b296d057

fs/9p/fid.c

+9 −9
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ static struct p9_fid *v9fs_fid_find_inode(struct inode *inode, kuid_t uid) 
	h = (struct hlist_head *)&inode->i_private;

	hlist_for_each_entry(fid, h, ilist) {

		if (uid_eq(fid->uid, uid)) {

			refcount_inc(&fid->count);

			p9_fid_get(fid);

			ret = fid;

			break;

		}
@@ -104,7 +104,7 @@ static struct p9_fid *v9fs_fid_find(struct dentry *dentry, kuid_t uid, int any) 
		hlist_for_each_entry(fid, h, dlist) {

			if (any || uid_eq(fid->uid, uid)) {

				ret = fid;

				refcount_inc(&ret->count);

				p9_fid_get(ret);

				break;

			}

		}
@@ -172,7 +172,7 @@ static struct p9_fid *v9fs_fid_lookup_with_uid(struct dentry *dentry, 
		old_fid = fid;



		fid = p9_client_walk(old_fid, 1, &dentry->d_name.name, 1);

		p9_client_clunk(old_fid);

		p9_fid_put(old_fid);

		goto fid_out;

	}

	up_read(&v9ses->rename_sem);
@@ -194,7 +194,7 @@ static struct p9_fid *v9fs_fid_lookup_with_uid(struct dentry *dentry, 
		if (IS_ERR(root_fid))

			return root_fid;



		refcount_inc(&root_fid->count);

		p9_fid_get(root_fid);

		v9fs_fid_add(dentry->d_sb->s_root, root_fid);

	}

	/* If we are root ourself just return that */
@@ -225,7 +225,7 @@ static struct p9_fid *v9fs_fid_lookup_with_uid(struct dentry *dentry, 
				     old_fid == root_fid /* clone */);

		/* non-cloning walk will return the same fid */

		if (fid != old_fid) {

			p9_client_clunk(old_fid);

			p9_fid_put(old_fid);

			old_fid = fid;

		}

		if (IS_ERR(fid)) {
@@ -240,11 +240,11 @@ static struct p9_fid *v9fs_fid_lookup_with_uid(struct dentry *dentry, 
		spin_lock(&dentry->d_lock);

		if (d_unhashed(dentry)) {

			spin_unlock(&dentry->d_lock);

			p9_client_clunk(fid);

			p9_fid_put(fid);

			fid = ERR_PTR(-ENOENT);

		} else {

			__add_fid(dentry, fid);

			refcount_inc(&fid->count);

			p9_fid_get(fid);

			spin_unlock(&dentry->d_lock);

		}

	}
@@ -301,7 +301,7 @@ struct p9_fid *v9fs_writeback_fid(struct dentry *dentry) 
	fid = clone_fid(ofid);

	if (IS_ERR(fid))

		goto error_out;

	p9_client_clunk(ofid);

	p9_fid_put(ofid);

	/*

	 * writeback fid will only be used to write back the

	 * dirty pages. We always request for the open fid in read-write
@@ -310,7 +310,7 @@ struct p9_fid *v9fs_writeback_fid(struct dentry *dentry) 
	 */

	err = p9_client_open(fid, O_RDWR);

	if (err < 0) {

		p9_client_clunk(fid);

		p9_fid_put(fid);

		fid = ERR_PTR(err);

		goto error_out;

	}

fs/9p/fid.h

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ static inline struct p9_fid *v9fs_fid_clone(struct dentry *dentry) 
		return fid;



	nfid = clone_fid(fid);

	p9_client_clunk(fid);

	p9_fid_put(fid);

	return nfid;

}

#endif

fs/9p/vfs_addr.c

+2 −2
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ static int v9fs_init_request(struct netfs_io_request *rreq, struct file *file) 
		BUG_ON(!fid);

	}



	refcount_inc(&fid->count);

	p9_fid_get(fid);

	rreq->netfs_priv = fid;

	return 0;

}
@@ -86,7 +86,7 @@ static void v9fs_free_request(struct netfs_io_request *rreq) 
{

	struct p9_fid *fid = rreq->netfs_priv;



	p9_client_clunk(fid);

	p9_fid_put(fid);

}



/**

fs/9p/vfs_dentry.c

+2 −2
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ static void v9fs_dentry_release(struct dentry *dentry) 
	p9_debug(P9_DEBUG_VFS, " dentry: %pd (%p)\n",

		 dentry, dentry);

	hlist_for_each_safe(p, n, (struct hlist_head *)&dentry->d_fsdata)

		p9_client_clunk(hlist_entry(p, struct p9_fid, dlist));

		p9_fid_put(hlist_entry(p, struct p9_fid, dlist));

	dentry->d_fsdata = NULL;

}
@@ -85,7 +85,7 @@ static int v9fs_lookup_revalidate(struct dentry *dentry, unsigned int flags) 
			retval = v9fs_refresh_inode_dotl(fid, inode);

		else

			retval = v9fs_refresh_inode(fid, inode);

		p9_client_clunk(fid);

		p9_fid_put(fid);



		if (retval == -ENOENT)

			return 0;

fs/9p/vfs_dir.c

+1 −1
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ int v9fs_dir_release(struct inode *inode, struct file *filp) 
		spin_lock(&inode->i_lock);

		hlist_del(&fid->ilist);

		spin_unlock(&inode->i_lock);

		p9_client_clunk(fid);

		p9_fid_put(fid);

	}



	if ((filp->f_mode & FMODE_WRITE)) {