pNFS/NFSv4: Fix a layout segment leak in pnfs_layout_process()

Trond Myklebust · Trond Myklebust · commit 814b84971388 · 2021-01-24T20:52:30.000-05:00
If the server returns a new stateid that does not match the one in our cache, then pnfs_layout_process() will leak the layout segments returned by pnfs_mark_layout_stateid_invalid(). Fixes: 9888d83 ("pNFS: Force a retry of LAYOUTGET if the stateid doesn't match our cache") Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
@@ -2417,6 +2417,7 @@ pnfs_layout_process(struct nfs4_layoutget *lgp)
 	spin_unlock(&ino->i_lock);
 	lseg->pls_layout = lo;
 	NFS_SERVER(ino)->pnfs_curr_ld->free_lseg(lseg);
+	pnfs_free_lseg_list(&free_me);
 	return ERR_PTR(-EAGAIN);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -2417,6 +2417,7 @@ pnfs_layout_process(struct nfs4_layoutget *lgp)`
`2417`	`2417`	`spin_unlock(&ino->i_lock);`
`2418`	`2418`	`lseg->pls_layout = lo;`
`2419`	`2419`	`NFS_SERVER(ino)->pnfs_curr_ld->free_lseg(lseg);`
	`2420`	`+ pnfs_free_lseg_list(&free_me);`
`2420`	`2421`	`return ERR_PTR(-EAGAIN);`
`2421`	`2422`	`}`
`2422`	`2423`