Merge branch 'for-4.2' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 5 Aug 2015 08:59:59 +0000 (10:59 +0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 5 Aug 2015 08:59:59 +0000 (10:59 +0200)
commit9e91edcd1b8b7f12c6484a0b17fb45774354e0b6
tree1205268178891f72aaef7f06a6388f8b410efd02
parentecf5fc6e9654cd7a268c782a523f072b2f1959f9
parent8fcd461db7c09337b6d2e22d25eb411123f379e3
Merge branch 'for-4.2' of git://linux-nfs.org/~bfields/linux

Pull nfsd fixes from Bruce Fields.

* 'for-4.2' of git://linux-nfs.org/~bfields/linux:
  nfsd: do nfs4_check_fh in nfs4_check_file instead of nfs4_check_olstateid
  nfsd: Fix a file leak on nfsd4_layout_setlease failure
  nfsd: Drop BUG_ON and ignore SECLABEL on absent filesystem