summaryrefslogtreecommitdiffstats
path: root/fs/nfs/pnfs.h
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@primarydata.com>2016-10-17 17:54:32 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-01-09 08:32:24 +0100
commit24b049fa0cd93e9e3e4166de8937b197b101a585 (patch)
treec90752302bc1e884eb4319ce62aee5bb46eed619 /fs/nfs/pnfs.h
parentb775b86a5fe8f45500ce027a60ca0f1e1f49a13e (diff)
downloadlinux-stable-24b049fa0cd93e9e3e4166de8937b197b101a585.tar.gz
linux-stable-24b049fa0cd93e9e3e4166de8937b197b101a585.tar.bz2
linux-stable-24b049fa0cd93e9e3e4166de8937b197b101a585.zip
pNFS: On error, do not send LAYOUTGET until the LAYOUTRETURN has completed
commit 6604b203fb6394ed1f24c21bfa3c207e5ae8e461 upstream. If there is an I/O error, we should not call LAYOUTGET until the LAYOUTRETURN that reports the error is complete. Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/nfs/pnfs.h')
-rw-r--r--fs/nfs/pnfs.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h
index 5c295512c967..44cad8afda0e 100644
--- a/fs/nfs/pnfs.h
+++ b/fs/nfs/pnfs.h
@@ -96,6 +96,7 @@ enum {
NFS_LAYOUT_RW_FAILED, /* get rw layout failed stop trying */
NFS_LAYOUT_BULK_RECALL, /* bulk recall affecting layout */
NFS_LAYOUT_RETURN, /* layoutreturn in progress */
+ NFS_LAYOUT_RETURN_LOCK, /* Serialise layoutreturn */
NFS_LAYOUT_RETURN_REQUESTED, /* Return this layout ASAP */
NFS_LAYOUT_INVALID_STID, /* layout stateid id is invalid */
NFS_LAYOUT_FIRST_LAYOUTGET, /* Serialize first layoutget */