tree 5a16a206a7e1aac18b96bed26f21ebbe15605fa6
parent 8546ee518c6662ddb3075249fb31d89e5dbfb7d5
parent 06effdbb49af5f6c7d20affaec74603914acc768
author J. Bruce Fields <bfields@redhat.com> 1332174879 -0400
committer J. Bruce Fields <bfields@redhat.com> 1332174905 -0400

nfsd: merge cookie collision fixes from ext4 tree

These changes fix readdir loops on ext4 filesystems with dir_index
turned on.  I'm pulling them from Ted's tree as I'd like to give them
some extra nfsd testing, and expect to be applying (potentially
conflicting) patches to the same code before the next merge window.

From the nfs-ext4-premerge branch of

	git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

Signed-off-by: J. Bruce Fields <bfields@redhat.com>