LU-1488 mdc: fix fid_res_name_eq() issue.

[fs/lustre-release.git] / lustre / mdc / mdc_fid.c

diff --git a/lustre/mdc/mdc_fid.c b/lustre/mdc/mdc_fid.c
index 1dc3922..f82ee52 100644 (file)
--- a/lustre/mdc/mdc_fid.c
+++ b/lustre/mdc/mdc_fid.c
@@ -412,12 +412,8 @@ EXPORT_SYMBOL(fid_build_reg_res_name);
  */
 int fid_res_name_eq(const struct lu_fid *f, const struct ldlm_res_id *name)
 {
-        int ret;
-
-        ret = name->name[LUSTRE_RES_ID_SEQ_OFF] == fid_seq(f) &&
-              name->name[LUSTRE_RES_ID_VER_OID_OFF] == fid_oid(f);
-        if (!fid_is_igif(f))
-                ret &= name->name[LUSTRE_RES_ID_VER_OID_OFF] == fid_ver(f);
-        return ret;
+       return name->name[LUSTRE_RES_ID_SEQ_OFF] == fid_seq(f) &&
+              name->name[LUSTRE_RES_ID_VER_OID_OFF] ==
+              (fid_oid(f) | (fid_is_igif(f) ? 0 : (__u64)fid_ver(f)<<32));
 }
 EXPORT_SYMBOL(fid_res_name_eq);