pNFS: Don't mark the layout as freed if the last lseg is marked for return

Address another memory leak.

Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>

diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index 08acfa49f115a3780b694ce523b228ed34f72c82..57ec46b57364f5b7606f0486ef30dd61d092bb1a 100644 (file)
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -455,6 +455,8 @@ pnfs_layout_remove_lseg(struct pnfs_layout_hdr *lo,
        list_del_init(&lseg->pls_list);
        /* Matched by pnfs_get_layout_hdr in pnfs_layout_insert_lseg */
        atomic_dec(&lo->plh_refcount);
+       if (test_bit(NFS_LSEG_LAYOUTRETURN, &lseg->pls_flags))
+               return;
        if (list_empty(&lo->plh_segs) &&
            !test_bit(NFS_LAYOUT_RETURN_REQUESTED, &lo->plh_flags) &&
            !test_bit(NFS_LAYOUT_RETURN, &lo->plh_flags)) {