LU-1198 idl: move FID VER to DLM resource name[1]

[fs/lustre-release.git] / lustre / ldlm / ldlm_resource.c

diff --git a/lustre/ldlm/ldlm_resource.c b/lustre/ldlm/ldlm_resource.c
index cbb0ac9..cd7936b 100644 (file)
--- a/lustre/ldlm/ldlm_resource.c
+++ b/lustre/ldlm/ldlm_resource.c
@@ -406,8 +406,8 @@ static unsigned ldlm_res_hop_fid_hash(cfs_hash_t *hs,
         __u32               val;
 
         fid.f_seq = id->name[LUSTRE_RES_ID_SEQ_OFF];
-        fid.f_oid = (__u32)id->name[LUSTRE_RES_ID_OID_OFF];
-        fid.f_ver = (__u32)id->name[LUSTRE_RES_ID_VER_OFF];
+        fid.f_oid = (__u32)id->name[LUSTRE_RES_ID_VER_OID_OFF];
+        fid.f_ver = (__u32)(id->name[LUSTRE_RES_ID_VER_OID_OFF] >> 32);
 
         hash = fid_flatten32(&fid);
         hash += (hash >> 4) + (hash << 12); /* mixing oid and seq */