diff options
| author | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-06-22 09:55:08 -0400 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-06-22 09:55:08 -0400 |
| commit | 1372a3130a3e0bfd38d82d476f0a907cc72ba816 (patch) | |
| tree | c9ca766000cd37914bf68e0d466cf4ab922498bf /fs/nfs/nfs4proc.c | |
| parent | 775f06ab49f5f9e2f6bca9292ef57efa868a0f67 (diff) | |
| parent | c70701131f7a8edea91fc49d11796d342cff7c62 (diff) | |
| download | linux-1372a3130a3e0bfd38d82d476f0a907cc72ba816.tar.bz2 | |
Merge branch 'bugfixes'
* bugfixes:
NFS: Ensure we set NFS_CONTEXT_RESEND_WRITES when requeuing writes
pNFS: Fix a memory leak when attempted pnfs fails
NFS: Ensure that we update the sequence id under the slot table lock
nfs: Initialize cb_sequenceres information before validate_seqid()
nfs: Only update callback sequnce id when CB_SEQUENCE success
NFSv4: nfs4_handle_delegation_recall_error should ignore EAGAIN
Diffstat (limited to 'fs/nfs/nfs4proc.c')
| -rw-r--r-- | fs/nfs/nfs4proc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 0fc1b0cdda98..e9cd45f1d60f 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -1678,6 +1678,7 @@ static int nfs4_handle_delegation_recall_error(struct nfs_server *server, struct "%d.\n", __func__, err); case 0: case -ENOENT: + case -EAGAIN: case -ESTALE: break; case -NFS4ERR_BADSESSION: |