From 787e1cfbccd41e98ee689aabf2796adcccd366bf Mon Sep 17 00:00:00 2001
From: alex <alex>
Date: Mon, 27 Jun 2005 15:48:56 +0000
Subject: [PATCH] b=6885

 - make lustre_fid smaller to fit to 256 bytes inode
   NOTE: improves test #3 significantly
---
 lustre/include/linux/lustre_idl.h | 2 ++
 lustre/include/linux/lustre_net.h | 8 ++++++--
 lustre/ptlrpc/pack_generic.c      | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/lustre/include/linux/lustre_idl.h b/lustre/include/linux/lustre_idl.h
index c94afce..202cd01 100644
--- a/lustre/include/linux/lustre_idl.h
+++ b/lustre/include/linux/lustre_idl.h
@@ -609,8 +609,10 @@ struct lustre_fid {
         __u64 lf_id;                   /* fid counter maintained on per 
                                           group basis */
         __u64 lf_group;                /* sequence group num */
+#if 0
         __u32 lf_version;              /* what snapfs version of inode */
         __u32 lf_padding;
+#endif
 };
 
 struct lustre_id {
diff --git a/lustre/include/linux/lustre_net.h b/lustre/include/linux/lustre_net.h
index 7e1aa52..4267dd6 100644
--- a/lustre/include/linux/lustre_net.h
+++ b/lustre/include/linux/lustre_net.h
@@ -790,8 +790,12 @@ void mdc_pack_id(struct lustre_id *id, obd_id ino,
 #define id_group(id)                            \
         (id)->li_fid.lf_group
 
+#if 0
 #define id_version(id)                          \
         (id)->li_fid.lf_version
+#else
+#define id_version(id)
+#endif
 
 #define id_assign_fid(id1, id2)                 \
         ((id1)->li_fid = (id2)->li_fid)
@@ -817,7 +821,7 @@ void mdc_pack_id(struct lustre_id *id, obd_id ino,
         do {                                                            \
                 id_fid((id)) = le64_to_cpu(id_fid((id)));               \
                 id_group((id)) = le64_to_cpu(id_group((id)));           \
-                id_version((id)) = le32_to_cpu(id_version((id)));       \
+                /*id_version((id)) = le32_to_cpu(id_version((id)));*/   \
                 id_ino((id)) = le64_to_cpu(id_ino((id)));               \
                 id_gen((id)) = le32_to_cpu(id_gen((id)));               \
                 id_type((id)) = le32_to_cpu(id_type((id)));             \
@@ -827,7 +831,7 @@ void mdc_pack_id(struct lustre_id *id, obd_id ino,
         do {                                                            \
                 id_fid((id)) = cpu_to_le64(id_fid((id)));               \
                 id_group((id)) = cpu_to_le64(id_group((id)));           \
-                id_version((id)) = cpu_to_le32(id_version((id)));       \
+                /*id_version((id)) = cpu_to_le32(id_version((id)));*/   \
                 id_ino((id)) = cpu_to_le64(id_ino((id)));               \
                 id_gen((id)) = cpu_to_le32(id_gen((id)));               \
                 id_type((id)) = cpu_to_le32(id_type((id)));             \
diff --git a/lustre/ptlrpc/pack_generic.c b/lustre/ptlrpc/pack_generic.c
index dba43a9..5c784f7 100644
--- a/lustre/ptlrpc/pack_generic.c
+++ b/lustre/ptlrpc/pack_generic.c
@@ -646,7 +646,7 @@ void lustre_swab_lustre_fid(struct lustre_fid *fid)
 {
         __swab64s (&fid->lf_id);
         __swab64s (&fid->lf_group);
-        __swab32s (&fid->lf_version);
+        /*__swab32s (&fid->lf_version);*/
 }
 
 void lustre_swab_lustre_id (struct lustre_id *id)
-- 
1.8.3.1