X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Finclude%2Fobd_lov.h;h=dfb2631fcd2eb98881324e0b7559cb647077b6db;hp=35b322f2b042fd5b3713ea41a62324343e025da8;hb=a067251099b6b225f2409f680d9e4423253d0730;hpb=01138321c7ce393c189a7ed11559c0938ce9f17e

diff --git a/lustre/include/obd_lov.h b/lustre/include/obd_lov.h
index 35b322f..dfb2631 100644
--- a/lustre/include/obd_lov.h
+++ b/lustre/include/obd_lov.h
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,6 +26,8 @@
 /*
  * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -37,19 +37,11 @@
 #ifndef _OBD_LOV_H__
 #define _OBD_LOV_H__
 
-static inline int lov_stripe_md_size(int stripes)
-{
-        return sizeof(struct lov_stripe_md) + stripes*sizeof(struct lov_oinfo*);
-}
+#define LOV_DEFAULT_STRIPE_SIZE (1 << LNET_MTU_BITS)
 
-static inline __u32 lov_mds_md_size(int stripes, __u32 lmm_magic)
+static inline int lov_stripe_md_size(__u16 stripes)
 {
-        if (lmm_magic == LOV_MAGIC_V3)
-                return sizeof(struct lov_mds_md_v3) +
-                        stripes * sizeof(struct lov_ost_data_v1);
-        else
-                return sizeof(struct lov_mds_md_v1) +
-                        stripes * sizeof(struct lov_ost_data_v1);
+        return sizeof(struct lov_stripe_md) + stripes*sizeof(struct lov_oinfo*);
 }
 
 struct lov_version_size {
@@ -82,6 +74,37 @@ static inline __u32 lov_mds_md_stripecnt(int ea_size, __u32 lmm_magic)
         return 0;
 }
 
+/* lov_do_div64(a, b) returns a % b, and a = a / b.
+ * The 32-bit code is LOV-specific due to knowing about stripe limits in
+ * order to reduce the divisor to a 32-bit number.  If the divisor is
+ * already a 32-bit value the compiler handles this directly. */
+#if BITS_PER_LONG > 32
+# define lov_do_div64(n,base) ({					\
+	uint64_t __base = (base);					\
+	uint64_t __rem;							\
+	__rem = ((uint64_t)(n)) % __base;				\
+	(n) = ((uint64_t)(n)) / __base;					\
+	__rem;								\
+  })
+#else
+# define lov_do_div64(n,base) ({					\
+	uint64_t __rem;							\
+	if ((sizeof(base) > 4) && (((base) & 0xffffffff00000000ULL) != 0)) {  \
+		int __remainder;					      \
+		LASSERTF(!((base) & (LOV_MIN_STRIPE_SIZE - 1)), "64 bit lov " \
+			 "division %llu / %llu\n", (n), (uint64_t)(base));    \
+		__remainder = (n) & (LOV_MIN_STRIPE_SIZE - 1);		\
+		(n) >>= LOV_MIN_STRIPE_BITS;				\
+		__rem = do_div(n, (base) >> LOV_MIN_STRIPE_BITS);	\
+		__rem <<= LOV_MIN_STRIPE_BITS;				\
+		__rem += __remainder;					\
+	} else {							\
+		__rem = do_div(n, base);				\
+	}								\
+	__rem;								\
+  })
+#endif
+
 #define IOC_LOV_TYPE                   'g'
 #define IOC_LOV_MIN_NR                 50
 #define IOC_LOV_SET_OSC_ACTIVE         _IOWR('g', 50, long)