LU-3544 fid: do open-by-fid by default

[fs/lustre-release.git] / lustre / lmv / lmv_internal.h

diff --git a/lustre/lmv/lmv_internal.h b/lustre/lmv/lmv_internal.h
index 622b2e1..daf6a7b 100644 (file)
--- a/lustre/lmv/lmv_internal.h
+++ b/lustre/lmv/lmv_internal.h
@@ -52,21 +52,8 @@
 int lmv_check_connect(struct obd_device *obd);
 
 int lmv_intent_lock(struct obd_export *exp, struct md_op_data *op_data,
-                    void *lmm, int lmmsize, struct lookup_intent *it,
-                    int flags, struct ptlrpc_request **reqp,
-                    ldlm_blocking_callback cb_blocking,
-                   __u64 extra_lock_flags);
-
-int lmv_intent_lookup(struct obd_export *exp, struct md_op_data *op_data,
-                      void *lmm, int lmmsize, struct lookup_intent *it,
-                      int flags, struct ptlrpc_request **reqp,
-                      ldlm_blocking_callback cb_blocking,
-                     __u64 extra_lock_flags);
-
-int lmv_intent_open(struct obd_export *exp, struct md_op_data *op_data,
-                    void *lmm, int lmmsize, struct lookup_intent *it,
-                    int flags, struct ptlrpc_request **reqp,
-                    ldlm_blocking_callback cb_blocking,
+                   struct lookup_intent *it, struct ptlrpc_request **reqp,
+                   ldlm_blocking_callback cb_blocking,
                    __u64 extra_lock_flags);
 
 int lmv_blocking_ast(struct ldlm_lock *, struct ldlm_lock_desc *,
@@ -75,8 +62,8 @@ int lmv_fld_lookup(struct lmv_obd *lmv, const struct lu_fid *fid,
                    mdsno_t *mds);
 int __lmv_fid_alloc(struct lmv_obd *lmv, struct lu_fid *fid,
                     mdsno_t mds);
-int lmv_fid_alloc(struct obd_export *exp, struct lu_fid *fid,
-                  struct md_op_data *op_data);
+int lmv_fid_alloc(const struct lu_env *env, struct obd_export *exp,
+                 struct lu_fid *fid, struct md_op_data *op_data);
 
 int lmv_unpack_md(struct obd_export *exp, struct lmv_stripe_md **lsmp,
                  const union lmv_mds_md *lmm, int stripe_count);
@@ -87,35 +74,55 @@ int lmv_revalidate_slaves(struct obd_export *exp, struct mdt_body *mbody,
                          int extra_lock_flags);
 
 static inline struct lmv_tgt_desc *
-lmv_get_target(struct lmv_obd *lmv, mdsno_t mds)
+lmv_get_target(struct lmv_obd *lmv, mdsno_t mdt_idx, int *index)
 {
-       int count = lmv->desc.ld_tgt_count;
        int i;
 
-       for (i = 0; i < count; i++) {
+       for (i = 0; i < lmv->desc.ld_tgt_count; i++) {
                if (lmv->tgts[i] == NULL)
                        continue;
 
-               if (lmv->tgts[i]->ltd_idx == mds)
+               if (lmv->tgts[i]->ltd_idx == mdt_idx) {
+                       if (index != NULL)
+                               *index = i;
                        return lmv->tgts[i];
+               }
        }
 
        return ERR_PTR(-ENODEV);
 }
 
+static inline int
+lmv_find_target_index(struct lmv_obd *lmv, const struct lu_fid *fid)
+{
+       struct lmv_tgt_desc     *ltd;
+       mdsno_t                 mdt_idx = 0;
+       int                     index = 0;
+
+       if (lmv->desc.ld_tgt_count > 1) {
+               int rc;
+               rc = lmv_fld_lookup(lmv, fid, &mdt_idx);
+               if (rc < 0)
+                       return rc;
+       }
+
+       ltd = lmv_get_target(lmv, mdt_idx, &index);
+       if (IS_ERR(ltd))
+               return PTR_ERR(ltd);
+
+       return index;
+}
+
 static inline struct lmv_tgt_desc *
 lmv_find_target(struct lmv_obd *lmv, const struct lu_fid *fid)
 {
-        mdsno_t mds = 0;
-        int rc;
+       int index;
 
-        if (lmv->desc.ld_tgt_count > 1) {
-                rc = lmv_fld_lookup(lmv, fid, &mds);
-                if (rc)
-                        return ERR_PTR(rc);
-        }
+       index = lmv_find_target_index(lmv, fid);
+       if (index < 0)
+               return ERR_PTR(index);
 
-        return lmv_get_target(lmv, mds);
+       return lmv->tgts[index];
 }
 
 static inline int lmv_stripe_md_size(int stripe_count)
@@ -149,7 +156,6 @@ lsm_name_to_stripe_info(const struct lmv_stripe_md *lsm, const char *name,
        return &lsm->lsm_md_oinfo[stripe_index];
 }
 
-
 struct lmv_tgt_desc
 *lmv_locate_mds(struct lmv_obd *lmv, struct md_op_data *op_data,
                struct lu_fid *fid);