diff options
| author | Andrew Tridgell <tridge@samba.org> | 2004-11-17 05:58:04 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:05:54 -0500 |
| commit | ae7caf08c1f47f3ad08856cfea2a3e6e956b48ab (patch) | |
| tree | a70a8867b4d85c5d34a1f30e6aff22cf37052d6f /source4/ntvfs/posix/pvfs_shortname.c | |
| parent | ca90965a3a2dabfc50be6d155c20004a61f81318 (diff) | |
| download | samba-ae7caf08c1f47f3ad08856cfea2a3e6e956b48ab.tar.gz | |
r3798: added support for alternate data streams in xattrs into pvfs.
The trickiest part about this was getting the sharing and locking
rules right, as alternate streams are separate locking spaces from the
main file for the purposes of byte range locking, and separate for
most share violation rules.
I suspect there are still problems with delete on close with alternate
data streams. I'll look at that next.
(This used to be commit b6452c4a2068cf7e837778559da002ae191b508a)
Diffstat (limited to 'source4/ntvfs/posix/pvfs_shortname.c')
| -rw-r--r-- | source4/ntvfs/posix/pvfs_shortname.c | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/source4/ntvfs/posix/pvfs_shortname.c b/source4/ntvfs/posix/pvfs_shortname.c index 3627820bb01..c0fc2fb1368 100644 --- a/source4/ntvfs/posix/pvfs_shortname.c +++ b/source4/ntvfs/posix/pvfs_shortname.c @@ -36,11 +36,6 @@ for simplicity, we only allow ascii characters in 8.3 names */ - /* hash alghorithm changed to FNV1 by idra@samba.org (Simo Sorce). - * see http://www.isthe.com/chongo/tech/comp/fnv/index.html for a - * discussion on Fowler / Noll / Vo (FNV) Hash by one of it's authors - */ - /* =============================================================================== NOTE NOTE NOTE!!! @@ -83,10 +78,6 @@ #define DEFAULT_MANGLE_PREFIX 4 -#define FNV1_PRIME 0x01000193 -/*the following number is a fnv1 of the string: idra@samba.org 2002 */ -#define FNV1_INIT 0xa6b93095 - #define MANGLE_BASECHARS "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ" #define FLAG_CHECK(c, flag) (ctx->char_flags[(uint8_t)(c)] & (flag)) @@ -105,19 +96,7 @@ static const char *reserved_names[] = static uint32_t mangle_hash(struct pvfs_mangle_context *ctx, const char *key, size_t length) { - uint32_t value = FNV1_INIT; - codepoint_t c; - size_t c_size; - - while (*key && length--) { - c = next_codepoint(key, &c_size); - c = toupper_w(c); - value *= (uint32_t)FNV1_PRIME; - value ^= (uint32_t)c; - key += c_size; - } - - return (value % ctx->mangle_modulus); + return pvfs_name_hash(key, length) % ctx->mangle_modulus; } /* |