summaryrefslogtreecommitdiffstats
path: root/fs/nfs/delegation.h
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2013-02-05 11:43:28 -0500
committerTrond Myklebust <Trond.Myklebust@netapp.com>2013-02-11 15:33:12 -0500
commitd25be546a86fcb2ea919fb909a42b79aa40b816c (patch)
tree5a2a62efa453f8c85299063cc83a1bd819f0778a /fs/nfs/delegation.h
parent9a99af494bd7141d567d00b5ef94b141821e158c (diff)
downloadlinux-stable-d25be546a86fcb2ea919fb909a42b79aa40b816c.tar.gz
linux-stable-d25be546a86fcb2ea919fb909a42b79aa40b816c.tar.bz2
linux-stable-d25be546a86fcb2ea919fb909a42b79aa40b816c.zip
NFSv4.1: Don't lose locks when a server reboots during delegation return
If the server reboots while we are converting a delegation into OPEN/LOCK stateids as part of a delegation return, the current code will simply exit with an error. This causes us to lose both delegation state and locking state (i.e. locking atomicity). Deal with this by exposing the delegation stateid during delegation return, so that we can recover the delegation, and then resume open/lock recovery. Note that not having to hold the nfs_inode->rwsem across the calls to nfs_delegation_claim_opens() also fixes a deadlock against the NFSv4.1 reboot recovery code. Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/delegation.h')
-rw-r--r--fs/nfs/delegation.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nfs/delegation.h b/fs/nfs/delegation.h
index bbc6a4dba0d8..d54d4fca6793 100644
--- a/fs/nfs/delegation.h
+++ b/fs/nfs/delegation.h
@@ -29,6 +29,7 @@ enum {
NFS_DELEGATION_NEED_RECLAIM = 0,
NFS_DELEGATION_RETURN,
NFS_DELEGATION_REFERENCED,
+ NFS_DELEGATION_RETURNING,
};
int nfs_inode_set_delegation(struct inode *inode, struct rpc_cred *cred, struct nfs_openres *res);