Commit d6bd1c49 authored by Peng Tao's avatar Peng Tao Committed by Luis Henriques

nfs: fix pnfs direct write memory leak

commit 8c393f9a upstream.

For pNFS direct writes, layout driver may dynamically allocate ds_cinfo.buckets.
So we need to take care to free them when freeing dreq.

Ideally this needs to be done inside layout driver where ds_cinfo.buckets
are allocated. But buckets are attached to dreq and reused across LD IO iterations.
So I feel it's OK to free them in the generic layer.
Signed-off-by: default avatarPeng Tao <tao.peng@primarydata.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: default avatarLuis Henriques <luis.henriques@canonical.com>
parent 50785403
...@@ -270,6 +270,7 @@ static void nfs_direct_req_free(struct kref *kref) ...@@ -270,6 +270,7 @@ static void nfs_direct_req_free(struct kref *kref)
{ {
struct nfs_direct_req *dreq = container_of(kref, struct nfs_direct_req, kref); struct nfs_direct_req *dreq = container_of(kref, struct nfs_direct_req, kref);
nfs_free_pnfs_ds_cinfo(&dreq->ds_cinfo);
if (dreq->l_ctx != NULL) if (dreq->l_ctx != NULL)
nfs_put_lock_context(dreq->l_ctx); nfs_put_lock_context(dreq->l_ctx);
if (dreq->ctx != NULL) if (dreq->ctx != NULL)
......
...@@ -1231,11 +1231,22 @@ struct nfs41_free_stateid_res { ...@@ -1231,11 +1231,22 @@ struct nfs41_free_stateid_res {
unsigned int status; unsigned int status;
}; };
static inline void
nfs_free_pnfs_ds_cinfo(struct pnfs_ds_commit_info *cinfo)
{
kfree(cinfo->buckets);
}
#else #else
struct pnfs_ds_commit_info { struct pnfs_ds_commit_info {
}; };
static inline void
nfs_free_pnfs_ds_cinfo(struct pnfs_ds_commit_info *cinfo)
{
}
#endif /* CONFIG_NFS_V4_1 */ #endif /* CONFIG_NFS_V4_1 */
struct nfs_page; struct nfs_page;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment