lkml.org 
[lkml]   [2020]   [Nov]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/2] 9p: apply review requests for fid refcounting
    Date
    Fix style issues in parent commit ("apply review requests for fid
    refcounting"), no functional change.

    Signed-off-by: Dominique Martinet <asmadeus@codewreck.org>
    ---
    fs/9p/fid.c | 10 ++++------
    fs/9p/fid.h | 2 +-
    include/net/9p/client.h | 2 +-
    net/9p/client.c | 4 ++--
    4 files changed, 8 insertions(+), 10 deletions(-)

    diff --git a/fs/9p/fid.c b/fs/9p/fid.c
    index 89643dabcdae..50118ec72a92 100644
    --- 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 @@ static struct p9_fid *v9fs_fid_lookup_with_uid(struct dentry *dentry,
    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 1fed96546728..f7f33509e169 100644
    --- 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 58ed9bd306bd..e1c308d8d288 100644
    --- 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 a6c8a915e0d8..ba4910138c5b 100644
    --- 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:
    --
    2.28.0
    \
     
     \ /
      Last update: 2020-11-19 17:10    [W:2.292 / U:0.172 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site