diff options
author | J. Bruce Fields <bfields@redhat.com> | 2012-03-19 16:34:39 (GMT) |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2012-03-19 16:35:05 (GMT) |
commit | 62b9510cb373d5722fdaba71d961d8f695acfcd5 (patch) | |
tree | 5a16a206a7e1aac18b96bed26f21ebbe15605fa6 /fs/ext4/hash.c | |
parent | 8546ee518c6662ddb3075249fb31d89e5dbfb7d5 (diff) | |
parent | 06effdbb49af5f6c7d20affaec74603914acc768 (diff) | |
download | linux-fsl-qoriq-62b9510cb373d5722fdaba71d961d8f695acfcd5.tar.xz |
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>
Diffstat (limited to 'fs/ext4/hash.c')
-rw-r--r-- | fs/ext4/hash.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ext4/hash.c b/fs/ext4/hash.c index ac8f168..fa8e491 100644 --- a/fs/ext4/hash.c +++ b/fs/ext4/hash.c @@ -200,8 +200,8 @@ int ext4fs_dirhash(const char *name, int len, struct dx_hash_info *hinfo) return -1; } hash = hash & ~1; - if (hash == (EXT4_HTREE_EOF << 1)) - hash = (EXT4_HTREE_EOF-1) << 1; + if (hash == (EXT4_HTREE_EOF_32BIT << 1)) + hash = (EXT4_HTREE_EOF_32BIT - 1) << 1; hinfo->hash = hash; hinfo->minor_hash = minor_hash; return 0; |