Commit ff5e72eb authored by Dominique Martinet's avatar Dominique Martinet
Browse files

9p: apply review requests for fid refcounting 

Fix style issues in parent commit ("apply review requests for fid
refcounting"), no functional change.

Link: http://lkml.kernel.org/r/1605802012-31133-2-git-send-email-asmadeus@codewreck.org


Fixes: 6636b6dc ("9p: add refcount to p9_fid struct")
Signed-off-by: default avatarDominique Martinet <asmadeus@codewreck.org>
parent 6636b6dc

fs/9p/fid.c

+4 −6
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 


static inline void __add_fid(struct dentry *dentry, struct p9_fid *fid)

{

	atomic_set(&fid->count, 1);

	hlist_add_head(&fid->dlist, (struct hlist_head *)&dentry->d_fsdata);

}
@@ -62,7 +61,7 @@ static struct p9_fid *v9fs_fid_find_inode(struct inode *inode, kuid_t uid) 
		}

	}

	if (ret && !IS_ERR(ret))

		atomic_inc(&ret->count);

		refcount_inc(&ret->count);

	spin_unlock(&inode->i_lock);

	return ret;

}
@@ -77,7 +76,6 @@ static struct p9_fid *v9fs_fid_find_inode(struct inode *inode, kuid_t uid) 
void v9fs_open_fid_add(struct inode *inode, struct p9_fid *fid)

{

	spin_lock(&inode->i_lock);

	atomic_set(&fid->count, 1);

	hlist_add_head(&fid->ilist, (struct hlist_head *)&inode->i_private);

	spin_unlock(&inode->i_lock);

}
@@ -110,7 +108,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;

				atomic_inc(&ret->count);

				refcount_inc(&ret->count);

				break;

			}

		}
@@ -201,7 +199,7 @@ static struct p9_fid *v9fs_fid_lookup_with_uid(struct dentry *dentry, 
	}

	/* If we are root ourself just return that */

	if (dentry->d_sb->s_root == dentry) {

		atomic_inc(&fid->count);

		refcount_inc(&fid->count);

		return fid;

	}

	/*
@@ -250,7 +248,7 @@ fid_out: 
			fid = ERR_PTR(-ENOENT);

		} else {

			__add_fid(dentry, fid);

			atomic_inc(&fid->count);

			refcount_inc(&fid->count);

			spin_unlock(&dentry->d_lock);

		}

	}

fs/9p/fid.h

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ static inline struct p9_fid *v9fs_fid_clone(struct dentry *dentry) 
	if (!fid || IS_ERR(fid))

		return fid;



	nfid = p9_client_walk(fid, 0, NULL, 1);

	nfid = clone_fid(fid);

	p9_client_clunk(fid);

	return nfid;

}

include/net/9p/client.h

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ enum fid_source { 
struct p9_fid {

	struct p9_client *clnt;

	u32 fid;

	atomic_t count;

	refcount_t count;

	int mode;

	struct p9_qid qid;

	u32 iounit;

net/9p/client.c

+2 −2
Original line number Diff line number Diff line
@@ -901,7 +901,7 @@ static struct p9_fid *p9_fid_create(struct p9_client *clnt) 
	fid->clnt = clnt;

	fid->rdir = NULL;

	fid->fid = 0;

	atomic_set(&fid->count, 1);

	refcount_set(&fid->count, 1);



	idr_preload(GFP_KERNEL);

	spin_lock_irq(&clnt->lock);
@@ -1466,7 +1466,7 @@ int p9_client_clunk(struct p9_fid *fid) 
		dump_stack();

		return 0;

	}

	if (!atomic_dec_and_test(&fid->count))

	if (!refcount_dec_and_test(&fid->count))

		return 0;



again:

CRA Git | Maintained and supported by SUSTech CRA and CCSE