Merge branch 'bugfixes'
authorTrond Myklebust <trond.myklebust@primarydata.com>
Mon, 22 Jun 2015 13:55:08 +0000 (09:55 -0400)
committerTrond Myklebust <trond.myklebust@primarydata.com>
Mon, 22 Jun 2015 13:55:08 +0000 (09:55 -0400)
* 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

1  2 
fs/nfs/nfs4proc.c
fs/nfs/write.c

Simple merge
diff --cc fs/nfs/write.c
Simple merge
This page took 0.031339 seconds and 5 git commands to generate.