LU-931 mdd: store lu_fid instead of pointer in md_capainfo

[fs/lustre-release.git] / lustre / mdd / mdd_internal.h

diff --git a/lustre/mdd/mdd_internal.h b/lustre/mdd/mdd_internal.h
index 84b6b04..4bdf444 100644 (file)
--- a/lustre/mdd/mdd_internal.h
+++ b/lustre/mdd/mdd_internal.h
@@ -603,7 +603,7 @@ static inline struct lustre_capa *mdd_object_capa(const struct lu_env *env,
         if (!ci)
                 return BYPASS_CAPA;
         for (i = 0; i < MD_CAPAINFO_MAX; i++)
         if (!ci)
                 return BYPASS_CAPA;
         for (i = 0; i < MD_CAPAINFO_MAX; i++)

-                if (ci->mc_fid[i] && lu_fid_eq(ci->mc_fid[i], fid))
+                if (lu_fid_eq(&ci->mc_fid[i], fid))

                         return ci->mc_capa[i];
         return NULL;
 }
                         return ci->mc_capa[i];
         return NULL;
 }


@@ -619,7 +619,7 @@ static inline void mdd_set_capainfo(const struct lu_env *env, int offset,
         /* NB: in mdt_init0 */
         if (!ci)
                 return;
         /* NB: in mdt_init0 */
         if (!ci)
                 return;

-        ci->mc_fid[offset]  = fid;
+        ci->mc_fid[offset]  = *fid;

         ci->mc_capa[offset] = capa;
 }
 
         ci->mc_capa[offset] = capa;
 }