branch: HEAD

[fs/lustre-release.git] / lustre / obdclass / mea.c

diff --git a/lustre/obdclass/mea.c b/lustre/obdclass/mea.c
index 8dffec3..15f15d8 100644 (file)
--- a/lustre/obdclass/mea.c
+++ b/lustre/obdclass/mea.c
@@ -20,24 +20,31 @@
  */
 
 #define DEBUG_SUBSYSTEM S_CLASS
+#include <obd_class.h>
 #ifdef __KERNEL__
 #include <linux/kmod.h>   /* for request_module() */
 #include <linux/module.h>
-#include <linux/obd_class.h>
 #include <linux/random.h>
 #include <linux/slab.h>
 #include <linux/pagemap.h>
-#else 
+#else
 #include <liblustre.h>
-#include <linux/obd_class.h>
-#include <linux/obd.h>
+#include <obd.h>
 #endif
-#include <linux/lprocfs_status.h>
+#include <lprocfs_status.h>
+#include <lustre/lustre_idl.h>
 
+#ifdef __KERNEL__
+#include <linux/jbd.h>
+#ifdef HAVE_SERVER_SUPPORT
+/* LDISKFS_SB() */
+#include <linux/ldiskfs_fs.h>
+#endif
+#endif
 static int mea_last_char_hash(int count, char *name, int namelen)
 {
         unsigned int c;
-        
+
         c = name[namelen - 1];
         if (c == 0)
                 CWARN("looks like wrong len is passed\n");
@@ -55,6 +62,85 @@ 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;
@@ -65,31 +151,31 @@ int raw_name2idx(int hashtype, int count, const char *name, int namelen)
 
         switch (hashtype) {
                 case MEA_MAGIC_LAST_CHAR:
-                        c = mea_last_char_hash(count, (char *) name, namelen);
+                        c = mea_last_char_hash(count, (char *)name, namelen);
                         break;
                 case MEA_MAGIC_ALL_CHARS:
-                        c = mea_all_chars_hash(count, (char *) name, namelen);
+                        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);
+                        CERROR("Unknown hash type 0x%x\n", hashtype);
         }
        
+        LASSERT(c < count);
         return c;
 }
 
-int mea_name2idx(struct mea *mea, char *name, int namelen)
+int mea_name2idx(struct lmv_stripe_md *mea, const char *name, int namelen)
 {
         unsigned int c;
 
-       /* just to simplify caller code */
-               if (mea == NULL)
-               return 0;
-
-        if (mea->mea_count == 0)
-                return 0;
+        LASSERT(mea && mea->mea_count);
 
        c = raw_name2idx(mea->mea_magic, mea->mea_count, name, namelen);
-       LASSERT(c < mea->mea_count);
+
+        LASSERT(c < mea->mea_count);
         return c;
 }