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>hifive-unleashed-5.1
parent
ea18cb3f11
commit
6543f80367
|
@ -1031,7 +1031,7 @@ filelayout_clear_request_commit(struct nfs_page *req,
|
||||||
}
|
}
|
||||||
out:
|
out:
|
||||||
nfs_request_remove_commit_list(req, cinfo);
|
nfs_request_remove_commit_list(req, cinfo);
|
||||||
pnfs_put_lseg_async(freeme);
|
pnfs_put_lseg_locked(freeme);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
|
@ -361,22 +361,43 @@ pnfs_put_lseg(struct pnfs_layout_segment *lseg)
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(pnfs_put_lseg);
|
EXPORT_SYMBOL_GPL(pnfs_put_lseg);
|
||||||
|
|
||||||
static void pnfs_put_lseg_async_work(struct work_struct *work)
|
static void pnfs_free_lseg_async_work(struct work_struct *work)
|
||||||
{
|
{
|
||||||
struct pnfs_layout_segment *lseg;
|
struct pnfs_layout_segment *lseg;
|
||||||
|
struct pnfs_layout_hdr *lo;
|
||||||
|
|
||||||
lseg = container_of(work, struct pnfs_layout_segment, pls_work);
|
lseg = container_of(work, struct pnfs_layout_segment, pls_work);
|
||||||
|
lo = lseg->pls_layout;
|
||||||
|
|
||||||
pnfs_put_lseg(lseg);
|
pnfs_free_lseg(lseg);
|
||||||
|
pnfs_put_layout_hdr(lo);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void pnfs_free_lseg_async(struct pnfs_layout_segment *lseg)
|
||||||
|
{
|
||||||
|
INIT_WORK(&lseg->pls_work, pnfs_free_lseg_async_work);
|
||||||
|
schedule_work(&lseg->pls_work);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
pnfs_put_lseg_async(struct pnfs_layout_segment *lseg)
|
pnfs_put_lseg_locked(struct pnfs_layout_segment *lseg)
|
||||||
{
|
{
|
||||||
INIT_WORK(&lseg->pls_work, pnfs_put_lseg_async_work);
|
if (!lseg)
|
||||||
schedule_work(&lseg->pls_work);
|
return;
|
||||||
|
|
||||||
|
assert_spin_locked(&lseg->pls_layout->plh_inode->i_lock);
|
||||||
|
|
||||||
|
dprintk("%s: lseg %p ref %d valid %d\n", __func__, lseg,
|
||||||
|
atomic_read(&lseg->pls_refcount),
|
||||||
|
test_bit(NFS_LSEG_VALID, &lseg->pls_flags));
|
||||||
|
if (atomic_dec_and_test(&lseg->pls_refcount)) {
|
||||||
|
struct pnfs_layout_hdr *lo = lseg->pls_layout;
|
||||||
|
pnfs_get_layout_hdr(lo);
|
||||||
|
pnfs_layout_remove_lseg(lo, lseg);
|
||||||
|
pnfs_free_lseg_async(lseg);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(pnfs_put_lseg_async);
|
EXPORT_SYMBOL_GPL(pnfs_put_lseg_locked);
|
||||||
|
|
||||||
static u64
|
static u64
|
||||||
end_offset(u64 start, u64 len)
|
end_offset(u64 start, u64 len)
|
||||||
|
|
|
@ -190,7 +190,7 @@ extern int nfs4_proc_layoutreturn(struct nfs4_layoutreturn *lrp);
|
||||||
/* pnfs.c */
|
/* pnfs.c */
|
||||||
void pnfs_get_layout_hdr(struct pnfs_layout_hdr *lo);
|
void pnfs_get_layout_hdr(struct pnfs_layout_hdr *lo);
|
||||||
void pnfs_put_lseg(struct pnfs_layout_segment *lseg);
|
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 set_pnfs_layoutdriver(struct nfs_server *, const struct nfs_fh *, u32);
|
||||||
void unset_pnfs_layoutdriver(struct nfs_server *);
|
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)
|
static inline int pnfs_return_layout(struct inode *ino)
|
||||||
{
|
{
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Loading…
Reference in New Issue