diff options
| author | Trond Myklebust | 2014-10-08 22:39:12 +0200 |
|---|---|---|
| committer | Trond Myklebust | 2014-10-08 22:45:43 +0200 |
| commit | 6543f803670530f6aa93790d9fa116d8395a537d (patch) | |
| tree | 0c39c9b0eaab0e5932eb43226c933e353abde369 /fs/nfs/pnfs.h | |
| parent | NFSv4: Remove dead prototype for nfs4_insert_deviceid_node() (diff) | |
| download | kernel-qcow2-linux-6543f803670530f6aa93790d9fa116d8395a537d.tar.gz kernel-qcow2-linux-6543f803670530f6aa93790d9fa116d8395a537d.tar.xz kernel-qcow2-linux-6543f803670530f6aa93790d9fa116d8395a537d.zip | |
NFSv4.1/pnfs: replace broken pnfs_put_lseg_async
You cannot call pnfs_put_lseg_async() more than once per lseg, so it
is really an inappropriate way to deal with a refcount issue.
Instead, replace it with a function that decrements the refcount, and
puts the final 'free' operation (which is incompatible with locks) on
the workqueue.
Cc: Weston Andros Adamson <dros@primarydata.com>
Fixes: e6cf82d1830f: pnfs: add pnfs_put_lseg_async
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'fs/nfs/pnfs.h')
| -rw-r--r-- | fs/nfs/pnfs.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h index 509a710148ba..9ae5b765b073 100644 --- a/fs/nfs/pnfs.h +++ b/fs/nfs/pnfs.h @@ -190,7 +190,7 @@ extern int nfs4_proc_layoutreturn(struct nfs4_layoutreturn *lrp); /* pnfs.c */ void pnfs_get_layout_hdr(struct pnfs_layout_hdr *lo); void pnfs_put_lseg(struct pnfs_layout_segment *lseg); -void pnfs_put_lseg_async(struct pnfs_layout_segment *lseg); +void pnfs_put_lseg_locked(struct pnfs_layout_segment *lseg); void set_pnfs_layoutdriver(struct nfs_server *, const struct nfs_fh *, u32); void unset_pnfs_layoutdriver(struct nfs_server *); @@ -445,10 +445,6 @@ static inline void pnfs_put_lseg(struct pnfs_layout_segment *lseg) { } -static inline void pnfs_put_lseg_async(struct pnfs_layout_segment *lseg) -{ -} - static inline int pnfs_return_layout(struct inode *ino) { return 0; |