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: 6636b6dcc3db ("9p: add refcount to p9_fid struct")
Signed-off-by: Dominique Martinet <asmadeus@codewreck.org>

diff --git a/fs/9p/fid.c b/fs/9p/fid.c
index 89643dabcdaef518271e55e4879116a44c420bd2..50118ec72a9266d8e72f9c5ee40e96ae0b209691 100644 (file)
--- a/fs/9p/fid.c
+++ b/fs/9p/fid.c
@@ -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);
                }
        }

diff --git a/fs/9p/fid.h b/fs/9p/fid.h
index 1fed965467282311e7287733f1bd50eeab128048..f7f33509e1692acbbb87d0f28bc7e757ec3db394 100644 (file)
--- a/fs/9p/fid.h
+++ b/fs/9p/fid.h
@@ -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;
 }

diff --git a/include/net/9p/client.h b/include/net/9p/client.h
index 58ed9bd306bd8af1dd5e0350c96e42f8982a7da2..e1c308d8d288e67beae5a9001fe2d73d0d7ec0dd 100644 (file)
--- a/include/net/9p/client.h
+++ b/include/net/9p/client.h
@@ -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;

diff --git a/net/9p/client.c b/net/9p/client.c
index a6c8a915e0d8e07bc20e3a98b2df4cb0dc6b8294..ba4910138c5becabf92f23c9bc001d91cff592e6 100644 (file)
--- a/net/9p/client.c
+++ b/net/9p/client.c
@@ -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: