nfs41: fix nfs4_proc_layoutget error handling (4bd5a980) · Commits · 戴 / test

nfs4_layoutget_release() drops layout hdr refcnt. Grab the refcnt early so that it is safe to call .release in case nfs4_alloc_pages fails. Signed-off-by:

Peng Tao <tao.peng@primarydata.com> Fixes: ("NFSv4.1: Hold reference to layout hdr in layoutget") Cc: stable@vger.kernel.org # 3.9+ Signed-off-by:

Trond Myklebust <trond.myklebust@primarydata.com>

fs/nfs/nfs4proc.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -7702,6 +7702,9 @@ nfs4_proc_layoutget(struct nfs4_layoutget *lgp, gfp_t gfp_flags)

		dprintk("--> %s\n", __func__);

		/* nfs4_layoutget_release calls pnfs_put_layout_hdr */
		pnfs_get_layout_hdr(NFS_I(inode)->layout);

		lgp->args.layout.pages = nfs4_alloc_pages(max_pages, gfp_flags);
		if (!lgp->args.layout.pages) {
		nfs4_layoutget_release(lgp);
		@@ -7714,9 +7717,6 @@ nfs4_proc_layoutget(struct nfs4_layoutget *lgp, gfp_t gfp_flags)
		lgp->res.seq_res.sr_slot = NULL;
		nfs4_init_sequence(&lgp->args.seq_args, &lgp->res.seq_res, 0);

		/* nfs4_layoutget_release calls pnfs_put_layout_hdr */
		pnfs_get_layout_hdr(NFS_I(inode)->layout);

		task = rpc_run_task(&task_setup_data);
		if (IS_ERR(task))
		return ERR_CAST(task);

Admin message