X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fobdclass%2Fmea.c;h=2a1ee39ff878139843ce52977fcf09b6fc1b229f;hb=f4ea7b630b8adc9856ee67c6d16549f36e14efd1;hp=15f15d895ce2e3059efbde90a34a14e4ae32a3f1;hpb=6e9079307b12abefe2e21461fd3a7be305d467a7;p=fs%2Flustre-release.git diff --git a/lustre/obdclass/mea.c b/lustre/obdclass/mea.c index 15f15d8..2a1ee39 100644 --- a/lustre/obdclass/mea.c +++ b/lustre/obdclass/mea.c @@ -1,22 +1,35 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: +/* + * GPL HEADER START * - * Copyright (C) 2002, 2003 Cluster File Systems, Inc. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * This file is part of Lustre, http://www.lustre.org. + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 only, + * as published by the Free Software Foundation. * - * Lustre is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License version 2 for more details (a copy is included + * in the LICENSE file that accompanied this code). * - * Lustre is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * You should have received a copy of the GNU General Public License + * version 2 along with this program; If not, see + * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf * - * You should have received a copy of the GNU General Public License - * along with Lustre; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + * + * GPL HEADER END + */ +/* + * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + */ +/* + * This file is part of Lustre, http://www.lustre.org/ + * Lustre is a trademark of Sun Microsystems, Inc. */ #define DEBUG_SUBSYSTEM S_CLASS @@ -24,7 +37,6 @@ #ifdef __KERNEL__ #include /* for request_module() */ #include -#include #include #include #else @@ -34,13 +46,6 @@ #include #include -#ifdef __KERNEL__ -#include -#ifdef HAVE_SERVER_SUPPORT -/* LDISKFS_SB() */ -#include -#endif -#endif static int mea_last_char_hash(int count, char *name, int namelen) { unsigned int c; @@ -62,110 +67,41 @@ static int mea_all_chars_hash(int count, char *name, int namelen) return c; } -#ifdef __KERNEL__ -/* This hash calculate method must be same as the lvar hash method */ - -#define LVAR_HASH_SANDWICH (0) -#define LVAR_HASH_TEA (1) -#define LVAR_HASH_R5 (0) -#define LVAR_HASH_PREFIX (0) - -static __u32 hash_build0(const char *name, int namelen) -{ - __u32 result; - - if (namelen == 0) - return 0; - if (strncmp(name, ".", 1) == 0 && namelen == 1) - return 1; - if (strncmp(name, "..", 2) == 0 && namelen == 2) - return 2; - - if (LVAR_HASH_PREFIX) { - result = 0; - strncpy((void *)&result, - name, min(namelen, (int)sizeof result)); - } else { - struct ldiskfs_dx_hash_info hinfo; - - if (LVAR_HASH_TEA) - hinfo.hash_version = LDISKFS_DX_HASH_TEA; - else - hinfo.hash_version = LDISKFS_DX_HASH_R5; - hinfo.seed = 0; - ldiskfsfs_dirhash(name, namelen, &hinfo); - result = hinfo.hash; - if (LVAR_HASH_SANDWICH) { - __u32 result2; - - hinfo.hash_version = LDISKFS_DX_HASH_TEA; - hinfo.seed = 0; - ldiskfsfs_dirhash(name, namelen, &hinfo); - result2 = hinfo.hash; - result = (0xfc000000 & result2) | (0x03ffffff & result); - } - } - - return result; -} - -enum { - HASH_GRAY_AREA = 1024 -}; - -static __u32 hash_build(const char *name, int namelen) -{ - __u32 hash; - - hash = (hash_build0(name, namelen) << 1) & MAX_HASH_SIZE; - if (hash > MAX_HASH_SIZE - HASH_GRAY_AREA) - hash &= HASH_GRAY_AREA - 1; - return hash; -} - -static int mea_hash_segment(int count, const char *name, int namelen) -{ - __u32 hash; - - LASSERT(IS_PO2(MAX_HASH_SIZE + 1)); - - hash = hash_build(name, namelen) / (MAX_HASH_SIZE / count); - LASSERTF(hash < count, "hash %x count %d \n", hash, count); - - return hash; -} -#else -static int mea_hash_segment(int count, char *name, int namelen) -{ -#warning "fix for liblustre" - return 0; -} -#endif int raw_name2idx(int hashtype, int count, const char *name, int namelen) { - unsigned int c = 0; - - LASSERT(namelen > 0); - if (count <= 1) - return 0; - - switch (hashtype) { - case MEA_MAGIC_LAST_CHAR: - c = mea_last_char_hash(count, (char *)name, namelen); - break; - case MEA_MAGIC_ALL_CHARS: - c = mea_all_chars_hash(count, (char *)name, namelen); - break; - case MEA_MAGIC_HASH_SEGMENT: - c = mea_hash_segment(count, (char *)name, namelen); - break; - default: - CERROR("Unknown hash type 0x%x\n", hashtype); - } - - LASSERT(c < count); - return c; + unsigned int c = 0; + int idx; + + LASSERT(namelen > 0); + + if (filename_is_volatile(name, namelen, &idx)) { + if ((idx >= 0) && (idx < count)) + return idx; + goto hashchoice; + } + + if (count <= 1) + return 0; + +hashchoice: + switch (hashtype) { + case MEA_MAGIC_LAST_CHAR: + c = mea_last_char_hash(count, (char *)name, namelen); + break; + case MEA_MAGIC_ALL_CHARS: + c = mea_all_chars_hash(count, (char *)name, namelen); + break; + case MEA_MAGIC_HASH_SEGMENT: + CERROR("Unsupported hash type MEA_MAGIC_HASH_SEGMENT\n"); + break; + default: + CERROR("Unknown hash type 0x%x\n", hashtype); + } + + LASSERT(c < count); + return c; } +EXPORT_SYMBOL(raw_name2idx); int mea_name2idx(struct lmv_stripe_md *mea, const char *name, int namelen) { @@ -178,4 +114,4 @@ int mea_name2idx(struct lmv_stripe_md *mea, const char *name, int namelen) LASSERT(c < mea->mea_count); return c; } - +EXPORT_SYMBOL(mea_name2idx);