projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8546ee5 06effdb)
nfsd: merge cookie collision fixes from ext4 tree
authorJ. Bruce Fields <bfields@redhat.com>
Mon, 19 Mar 2012 16:34:39 +0000 (12:34 -0400)
committerJ. Bruce Fields <bfields@redhat.com>
Mon, 19 Mar 2012 16:35:05 +0000 (12:35 -0400)
commit62b9510cb373d5722fdaba71d961d8f695acfcd5
tree5a16a206a7e1aac18b96bed26f21ebbe15605fa6tree | snapshot
parent8546ee518c6662ddb3075249fb31d89e5dbfb7d5commit | diff
parent06effdbb49af5f6c7d20affaec74603914acc768commit | diff
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>
John Crispins staging tree