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

Commit 1013df61 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Trond Myklebust
Browse files

pnfs: do not pass uninitialized lsegs to ->free_lseg 



Ensure the lsegs are initialized early so that we don't pass an unitialized
one back to ->free_lseg during error processing.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 2e11f829

fs/nfs/pnfs.c

+3 −2
Original line number Diff line number Diff line
@@ -1358,6 +1358,9 @@ pnfs_layout_process(struct nfs4_layoutget *lgp) 
		goto out;

	}



	init_lseg(lo, lseg);

	lseg->pls_range = res->range;



	spin_lock(&ino->i_lock);

	if (test_bit(NFS_LAYOUT_BULK_RECALL, &lo->plh_flags)) {

		dprintk("%s forget reply due to recall\n", __func__);
@@ -1375,8 +1378,6 @@ pnfs_layout_process(struct nfs4_layoutget *lgp) 
	/* Done processing layoutget. Set the layout stateid */

	pnfs_set_layout_stateid(lo, &res->stateid, false);



	init_lseg(lo, lseg);

	lseg->pls_range = res->range;

	pnfs_get_lseg(lseg);

	pnfs_layout_insert_lseg(lo, lseg);