Merge branch 'bugfixes'
authorTrond Myklebust <trond.myklebust@primarydata.com>
Thu, 7 Jan 2016 23:45:36 +0000 (18:45 -0500)
committerTrond Myklebust <trond.myklebust@primarydata.com>
Thu, 7 Jan 2016 23:45:36 +0000 (18:45 -0500)
commitdaaadd2283eb8bcae3b866592a9a1c807cc60605
tree7abff6186295207d923f1e9225b9340087696070
parent210c7c1750fdf769647d1d526c9ea34c412c9eee
parent13331a551ab4df87f7a027d2cab392da96aba1de
Merge branch 'bugfixes'

* bugfixes:
  SUNRPC: Fixup socket wait for memory
  SUNRPC: Fix a missing break in rpc_anyaddr()
  pNFS/flexfiles: Fix an Oopsable typo in ff_mirror_match_fh()
  NFS: Fix attribute cache revalidation
  NFS: Ensure we revalidate attributes before using execute_ok()
  NFS: Flush reclaim writes using FLUSH_COND_STABLE
  NFS: Background flush should not be low priority
  NFSv4.1/pnfs: Fixup an lo->plh_block_lgets imbalance in layoutreturn
  NFSv4: Don't perform cached access checks before we've OPENed the file
  NFS: Allow the combination pNFS and labeled NFS
  NFS42: handle layoutstats stateid error
  nfs: Fix race in __update_open_stateid()
  nfs: fix missing assignment in nfs4_sequence_done tracepoint
fs/nfs/flexfilelayout/flexfilelayout.c
fs/nfs/inode.c
fs/nfs/nfs4proc.c
fs/nfs/nfs4trace.h
fs/nfs/write.c
net/sunrpc/xprtsock.c