summaryrefslogtreecommitdiffstats
path: root/fs/ext3/hash.c
diff options
context:
space:
mode:
authorEric Sandeen <sandeen@redhat.com>2012-04-26 13:10:39 -0500
committerJan Kara <jack@suse.cz>2012-05-15 23:34:39 +0200
commitd7dab39b6e16d5eea78ed3c705d2a2d0772b4f06 (patch)
treea2b201b2afd8cd1d278947f7e080ce7457e88814 /fs/ext3/hash.c
parenta80b12c3d08dbbf15e6a551e481c32a2df4911f3 (diff)
downloadop-kernel-dev-d7dab39b6e16d5eea78ed3c705d2a2d0772b4f06.zip
op-kernel-dev-d7dab39b6e16d5eea78ed3c705d2a2d0772b4f06.tar.gz
ext3: return 32/64-bit dir name hash according to usage type
This is based on commit d1f5273e9adb40724a85272f248f210dc4ce919a ext4: return 32/64-bit dir name hash according to usage type by Fan Yong <yong.fan@whamcloud.com> Traditionally ext2/3/4 has returned a 32-bit hash value from llseek() to appease NFSv2, which can only handle a 32-bit cookie for seekdir() and telldir(). However, this causes problems if there are 32-bit hash collisions, since the NFSv2 server can get stuck resending the same entries from the directory repeatedly. Allow ext3 to return a full 64-bit hash (both major and minor) for telldir to decrease the chance of hash collisions. This patch does implement a new ext3_dir_llseek op, because with 64-bit hashes, nfs will attempt to seek to a hash "offset" which is much larger than ext3's s_maxbytes. So for dx dirs, we call generic_file_llseek_size() with the appropriate max hash value as the maximum seekable size. Otherwise we just pass through to generic_file_llseek(). Patch-updated-by: Bernd Schubert <bernd.schubert@itwm.fraunhofer.de> Patch-updated-by: Eric Sandeen <sandeen@redhat.com> (blame us if something is not correct) Signed-off-by: Eric Sandeen <sandeen@redhat.com> Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/ext3/hash.c')
-rw-r--r--fs/ext3/hash.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ext3/hash.c b/fs/ext3/hash.c
index d10231d..ede315c 100644
--- a/fs/ext3/hash.c
+++ b/fs/ext3/hash.c
@@ -198,8 +198,8 @@ int ext3fs_dirhash(const char *name, int len, struct dx_hash_info *hinfo)
return -1;
}
hash = hash & ~1;
- if (hash == (EXT3_HTREE_EOF << 1))
- hash = (EXT3_HTREE_EOF-1) << 1;
+ if (hash == (EXT3_HTREE_EOF_32BIT << 1))
+ hash = (EXT3_HTREE_EOF_32BIT - 1) << 1;
hinfo->hash = hash;
hinfo->minor_hash = minor_hash;
return 0;
OpenPOWER on IntegriCloud