From: Trond Myklebust <trond.myklebust@primarydata.com>
Date: Mon, 17 Aug 2015 18:36:32 +0000 (-0500)
Subject: Merge branch 'layoutfixes'
X-Git-Tag: firefly_0821_release~176^2~1127^2~59
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=74918f937d9896aa2910cfe81f06499abd1dba59;p=firefly-linux-kernel-4.4.55.git

Merge branch 'layoutfixes'

* layoutfixes:
  NFSv4.1/pnfs: Remove redundant wakeup in pnfs_send_layoutreturn()
  NFSv4.1/pnfs: Remove redundant check in pnfs_layoutgets_blocked()
  NFSv4.1/pnfs: Remove redundant lo->plh_block_lgets in layoutreturn
  NFSv4.1/pnfs: Don't prevent layoutgets when doing return-on-close
  NFSv4.1/pnfs: Fix serialisation of layout return and layoutget
  NFSv4.1/pnfs: Remove redundant checks in pnfs_layoutgets_blocked()
  pNFS: Tighten up locking around DS commit buckets
---

74918f937d9896aa2910cfe81f06499abd1dba59