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

Browse source

Pull nfsd bugfixes from Bruce Fields:
 "A couple minor nfsd bugfixes"

* 'for-3.17' of git://linux-nfs.org/~bfields/linux:
  lockd: fix rpcbind crash on lockd startup failure
  nfsd4: fix rd_dircount enforcement

...

This commit is contained in:

Linus Torvalds 2014-09-08 15:18:06 -07:00

parent 35af25616c 7c17705e77

commit 861b7102b5

2 changed files with 14 additions and 4 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

4

fs/lockd/svc.c

View file

14

fs/nfsd/nfs4xdr.c

View file