Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6db6dd7d authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFS: Ensure that we free the rpc_task after read and write cleanups are done 



This patch ensures that we free the rpc_task after the cleanup callbacks
are done in order to avoid a deadlock problem that can be triggered if
the callback needs to wait for another workqueue item to complete.

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
Cc: Weston Andros Adamson <dros@netapp.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: Bruce Fields <bfields@fieldses.org>
Cc: stable@vger.kernel.org [>= 3.5]
parent c6567ed1

fs/nfs/read.c

+7 −3
Original line number Diff line number Diff line
@@ -91,12 +91,16 @@ void nfs_readdata_release(struct nfs_read_data *rdata) 
	put_nfs_open_context(rdata->args.context);

	if (rdata->pages.pagevec != rdata->pages.page_array)

		kfree(rdata->pages.pagevec);

	if (rdata != &read_header->rpc_data)

		kfree(rdata);

	else

	if (rdata == &read_header->rpc_data) {

		rdata->header = NULL;

		rdata = NULL;

	}

	if (atomic_dec_and_test(&hdr->refcnt))

		hdr->completion_ops->completion(hdr);

	/* Note: we only free the rpc_task after callbacks are done.

	 * See the comment in rpc_free_task() for why

	 */

	kfree(rdata);

}

EXPORT_SYMBOL_GPL(nfs_readdata_release);

fs/nfs/write.c

+7 −3
Original line number Diff line number Diff line
@@ -126,12 +126,16 @@ void nfs_writedata_release(struct nfs_write_data *wdata) 
	put_nfs_open_context(wdata->args.context);

	if (wdata->pages.pagevec != wdata->pages.page_array)

		kfree(wdata->pages.pagevec);

	if (wdata != &write_header->rpc_data)

		kfree(wdata);

	else

	if (wdata == &write_header->rpc_data) {

		wdata->header = NULL;

		wdata = NULL;

	}

	if (atomic_dec_and_test(&hdr->refcnt))

		hdr->completion_ops->completion(hdr);

	/* Note: we only free the rpc_task after callbacks are done.

	 * See the comment in rpc_free_task() for why

	 */

	kfree(wdata);

}

EXPORT_SYMBOL_GPL(nfs_writedata_release);