Commit e0f8058f authored by Jonathan Curley's avatar Jonathan Curley Committed by Trond Myklebust
Browse files

NFSv4/pNFS: Clear NFS_INO_LAYOUTCOMMIT in pnfs_mark_layout_stateid_invalid 



Fixes a crash when layout is null during this call stack:

write_inode
    -> nfs4_write_inode
        -> pnfs_layoutcommit_inode

pnfs_set_layoutcommit relies on the lseg refcount to keep the layout
around. Need to clear NFS_INO_LAYOUTCOMMIT otherwise we might attempt
to reference a null layout.

Fixes: fe1cf946 ("pNFS: Clear all layout segment state in pnfs_mark_layout_stateid_invalid")
Signed-off-by: default avatarJonathan Curley <jcurley@purestorage.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
parent 9e9fdd0a

fs/nfs/pnfs.c

+1 −0
Original line number Diff line number Diff line
@@ -464,6 +464,7 @@ pnfs_mark_layout_stateid_invalid(struct pnfs_layout_hdr *lo, 
	struct pnfs_layout_segment *lseg, *next;



	set_bit(NFS_LAYOUT_INVALID_STID, &lo->plh_flags);

	clear_bit(NFS_INO_LAYOUTCOMMIT, &NFS_I(lo->plh_inode)->flags);

	list_for_each_entry_safe(lseg, next, &lo->plh_segs, pls_list)

		pnfs_clear_lseg_state(lseg, lseg_list);

	pnfs_clear_layoutreturn_info(lo);