diff options
| author | Trond Myklebust | 2015-06-22 15:55:08 +0200 |
|---|---|---|
| committer | Trond Myklebust | 2015-06-22 15:55:08 +0200 |
| commit | 1372a3130a3e0bfd38d82d476f0a907cc72ba816 (patch) | |
| tree | c9ca766000cd37914bf68e0d466cf4ab922498bf /fs/nfs/write.c | |
| parent | SUNRPC: Set the TCP user timeout option on client sockets (diff) | |
| parent | NFS: Ensure we set NFS_CONTEXT_RESEND_WRITES when requeuing writes (diff) | |
| download | kernel-qcow2-linux-1372a3130a3e0bfd38d82d476f0a907cc72ba816.tar.gz kernel-qcow2-linux-1372a3130a3e0bfd38d82d476f0a907cc72ba816.tar.xz kernel-qcow2-linux-1372a3130a3e0bfd38d82d476f0a907cc72ba816.zip | |
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/write.c')
| -rw-r--r-- | fs/nfs/write.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nfs/write.c b/fs/nfs/write.c index d0f1f210342e..84ba7268833d 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c @@ -1289,6 +1289,7 @@ static void nfs_initiate_write(struct nfs_pgio_header *hdr, static void nfs_redirty_request(struct nfs_page *req) { nfs_mark_request_dirty(req); + set_bit(NFS_CONTEXT_RESEND_WRITES, &req->wb_context->flags); nfs_unlock_request(req); nfs_end_page_writeback(req); nfs_release_request(req); |