diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-08-06 14:48:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-08-06 14:48:54 -0700 |
| commit | ea0c39260d0c1d8e11d89c9d42ca48e172d1c868 (patch) | |
| tree | 84ad4002f34acceea580e046de8aa3574cded014 /fs/9p/fid.h | |
| parent | c42b729ef6bfc72fed56f81f589a39298b9d12c8 (diff) | |
| parent | aa7aeee169480e98cf41d83c01290a37e569be6d (diff) | |
| download | linux-ea0c39260d0c1d8e11d89c9d42ca48e172d1c868.tar.gz linux-ea0c39260d0c1d8e11d89c9d42ca48e172d1c868.tar.bz2 linux-ea0c39260d0c1d8e11d89c9d42ca48e172d1c868.zip | |
Merge tag '9p-for-5.20' of https://github.com/martinetd/linux
Pull 9p updates from Dominique Martinet:
- a couple of fixes
- add a tracepoint for fid refcounting
- some cleanup/followup on fid lookup
- some cleanup around req refcounting
* tag '9p-for-5.20' of https://github.com/martinetd/linux:
net/9p: Initialize the iounit field during fid creation
net: 9p: fix refcount leak in p9_read_work() error handling
9p: roll p9_tag_remove into p9_req_put
9p: Add client parameter to p9_req_put()
9p: Drop kref usage
9p: Fix some kernel-doc comments
9p fid refcount: cleanup p9_fid_put calls
9p fid refcount: add a 9p_fid_ref tracepoint
9p fid refcount: add p9_fid_get/put wrappers
9p: Fix minor typo in code comment
9p: Remove unnecessary variable for old fids while walking from d_parent
9p: Make the path walk logic more clear about when cloning is required
9p: Track the root fid with its own variable during lookups
Diffstat (limited to 'fs/9p/fid.h')
| -rw-r--r-- | fs/9p/fid.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/9p/fid.h b/fs/9p/fid.h index f7f33509e169..8a4e8cd12ca2 100644 --- a/fs/9p/fid.h +++ b/fs/9p/fid.h @@ -13,9 +13,9 @@ static inline struct p9_fid *v9fs_parent_fid(struct dentry *dentry) { return v9fs_fid_lookup(dentry->d_parent); } -void v9fs_fid_add(struct dentry *dentry, struct p9_fid *fid); +void v9fs_fid_add(struct dentry *dentry, struct p9_fid **fid); struct p9_fid *v9fs_writeback_fid(struct dentry *dentry); -void v9fs_open_fid_add(struct inode *inode, struct p9_fid *fid); +void v9fs_open_fid_add(struct inode *inode, struct p9_fid **fid); static inline struct p9_fid *clone_fid(struct p9_fid *fid) { return IS_ERR(fid) ? fid : p9_client_walk(fid, 0, NULL, 1); @@ -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 |