Merge branch 'for-3.16' of git://linux-nfs.org/~bfields/linux

Browse source

Pull nfsd bugfixes from Bruce Fields:
 "Fixes for a new regression from the xdr encoding rewrite, and a
  delegation problem we've had for a while (made somewhat more annoying
  by the vfs delegation support added in 3.13)"

* 'for-3.16' of git://linux-nfs.org/~bfields/linux:
  NFSD: fix bug for readdir of pseudofs
  NFSD: Don't hand out delegations for 30 seconds after recalling them.

...

This commit is contained in:

Linus Torvalds 2014-06-21 14:20:38 -10:00

parent 401c58fcbb f41c5ad2ff

commit 147f1404db

2 changed files with 79 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

78

fs/nfsd/nfs4state.c

View file

1

fs/nfsd/nfs4xdr.c

View file