skip LAYOUTRETURN if layout is invalid
authorOlga Kornievskaia <olga.kornievskaia@gmail.com>
Mon, 11 Jun 2018 19:32:06 +0000 (15:32 -0400)
committerTrond Myklebust <trond.myklebust@hammerspace.com>
Tue, 12 Jun 2018 12:48:04 +0000 (08:48 -0400)
commit93b7f7ad2018d2037559b1d0892417864c78b371
tree381b44b5f8ec0bbc614368cd3349a4e9f84f32f5
parentf9312a541050007ec59eb0106273a0a10718cd83
skip LAYOUTRETURN if layout is invalid

Currently, when IO to DS fails, client returns the layout and
retries against the MDS. However, then on umounting (inode eviction)
it returns the layout again.

This is because pnfs_return_layout() was changed in
commit d78471d32bb6 ("pnfs/blocklayout: set PNFS_LAYOUTRETURN_ON_ERROR")
to always set NFS_LAYOUT_RETURN_REQUESTED so even if we returned
the layout, it will be returned again. Instead, let's also check
if we have already marked the layout invalid.

Signed-off-by: Olga Kornievskaia <kolga@netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
fs/nfs/pnfs.c