Fix hunk failures and thus add a slightly different patch for 2.6.5 (SLES9)

[fs/lustre-release.git] / lustre / fid / fid_lib.c

diff --git a/lustre/fid/fid_lib.c b/lustre/fid/fid_lib.c
index cf33390..f0fdfd4 100644 (file)
--- a/lustre/fid/fid_lib.c
+++ b/lustre/fid/fid_lib.c
@@ -43,14 +43,22 @@
 #include <lu_object.h>
 #include <lustre_fid.h>
 
-/*
- * Sequence space, starts from 0x100000000ULL to have first 0x100000000ULL
- * sequences used for special purposes. 
- * Those fids are reserved for special purposes (igifs, etc.).
+/**
+ * A cluster-wide range from which fid-sequences are granted to servers and
+ * then clients.
+ *
+ * Fid namespace:
+ * <pre>
+ * Normal FID:        seq:64 [2^33,2^64-1]      oid:32          ver:32
+ * IGIF      :        0:32, ino:32              gen:32          0:32
+ * IDIF      :        0:31, 1:1, ost-index:16,  objd:48         0:32
+ * </pre>
+ *
+ * The first 0x400 sequences of normal FID are reserved for special purpose.
  */
 const struct lu_range LUSTRE_SEQ_SPACE_RANGE = {
-        (0x100000000ULL),
-        ((__u64)~0ULL)
+        FID_SEQ_START + 0x400ULL,
+        (__u64)~0ULL
 };
 EXPORT_SYMBOL(LUSTRE_SEQ_SPACE_RANGE);