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

Commit a8897f26 authored by Peng Tao's avatar Peng Tao Committed by Greg Kroah-Hartman
Browse files

nfs41: fix nfs4_proc_layoutget error handling 



commit 4bd5a980de87d2b5af417485bde97b8eb3d6cf6a upstream.

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: default avatarPeng Tao <tao.peng@primarydata.com>
Fixes: a47970ff ("NFSv4.1: Hold reference to layout hdr in layoutget")
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 243cc955

fs/nfs/nfs4proc.c

+3 −3
Original line number Diff line number Diff line
@@ -7704,6 +7704,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);
@@ -7716,9 +7719,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);