LU-6088 lmv: Do not revalidate stripes with master lock

[fs/lustre-release.git] / lustre / include / obd_class.h

diff --git a/lustre/include/obd_class.h b/lustre/include/obd_class.h
index d9428b7..dc9bb2d 100644 (file)
--- a/lustre/include/obd_class.h
+++ b/lustre/include/obd_class.h
@@ -1659,25 +1659,15 @@ static inline int md_free_lustre_md(struct obd_export *exp,
         RETURN(MDP(exp->exp_obd, free_lustre_md)(exp, md));
 }
 
-static inline int md_update_lsm_md(struct obd_export *exp,
-                                  struct lmv_stripe_md *lsm,
-                                  struct mdt_body *body,
-                                  ldlm_blocking_callback cb)
-{
-       ENTRY;
-       EXP_CHECK_MD_OP(exp, update_lsm_md);
-       EXP_MD_COUNTER_INCREMENT(exp, update_lsm_md);
-       RETURN(MDP(exp->exp_obd, update_lsm_md)(exp, lsm, body, cb));
-}
-
 static inline int md_merge_attr(struct obd_export *exp,
                                const struct lmv_stripe_md *lsm,
-                               struct cl_attr *attr)
+                               struct cl_attr *attr,
+                               ldlm_blocking_callback cb)
 {
        ENTRY;
        EXP_CHECK_MD_OP(exp, merge_attr);
        EXP_MD_COUNTER_INCREMENT(exp, merge_attr);
-       RETURN(MDP(exp->exp_obd, merge_attr)(exp, lsm, attr));
+       RETURN(MDP(exp->exp_obd, merge_attr)(exp, lsm, attr, cb));
 }
 
 static inline int md_setxattr(struct obd_export *exp,