LU-216 ldiskfs: use proper arguments for ldiskfs_free_blocks

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

diff --git a/lustre/lmv/lmv_internal.h b/lustre/lmv/lmv_internal.h
index bef090c..c3485b4 100644 (file)
--- a/lustre/lmv/lmv_internal.h
+++ b/lustre/lmv/lmv_internal.h
@@ -27,7 +27,7 @@
  * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2012, Intel Corporation.
+ * Copyright (c) 2011, 2013, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -39,6 +39,7 @@
 
 #include <lustre/lustre_idl.h>
 #include <obd.h>
+#include <lustre_lmv.h>
 
 #define LMV_MAX_TGT_COUNT 128
 
@@ -51,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 *,
@@ -74,41 +62,16 @@ 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);
-
-static inline struct lmv_stripe_md *lmv_get_mea(struct ptlrpc_request *req)
-{
-        struct mdt_body         *body;
-        struct lmv_stripe_md    *mea;
-
-        LASSERT(req != NULL);
-
-        body = req_capsule_server_get(&req->rq_pill, &RMF_MDT_BODY);
+int lmv_fid_alloc(const struct lu_env *env, struct obd_export *exp,
+                 struct lu_fid *fid, struct md_op_data *op_data);
 
-        if (!body || !S_ISDIR(body->mode) || !body->eadatasize)
-                return NULL;
+int lmv_unpack_md(struct obd_export *exp, struct lmv_stripe_md **lsmp,
+                 const union lmv_mds_md *lmm, int stripe_count);
 
-        mea = req_capsule_server_sized_get(&req->rq_pill, &RMF_MDT_MD,
-                                           body->eadatasize);
-        LASSERT(mea != NULL);
-
-        if (mea->mea_count == 0)
-                return NULL;
-        if( mea->mea_magic != MEA_MAGIC_LAST_CHAR &&
-                mea->mea_magic != MEA_MAGIC_ALL_CHARS &&
-                mea->mea_magic != MEA_MAGIC_HASH_SEGMENT)
-                return NULL;
-
-        return mea;
-}
-
-static inline int lmv_get_easize(struct lmv_obd *lmv)
-{
-        return sizeof(struct lmv_stripe_md) +
-                lmv->desc.ld_tgt_count *
-                sizeof(struct lu_fid);
-}
+int lmv_revalidate_slaves(struct obd_export *exp, struct mdt_body *mbody,
+                         struct lmv_stripe_md *lsm,
+                         ldlm_blocking_callback cb_blocking,
+                         int extra_lock_flags);
 
 static inline struct lmv_tgt_desc *
 lmv_get_target(struct lmv_obd *lmv, mdsno_t mds)
@@ -123,7 +86,8 @@ lmv_get_target(struct lmv_obd *lmv, mdsno_t mds)
                if (lmv->tgts[i]->ltd_idx == mds)
                        return lmv->tgts[i];
        }
-       return NULL;
+
+       return ERR_PTR(-ENODEV);
 }
 
 static inline struct lmv_tgt_desc *
@@ -141,17 +105,44 @@ lmv_find_target(struct lmv_obd *lmv, const struct lu_fid *fid)
         return lmv_get_target(lmv, mds);
 }
 
+static inline int lmv_stripe_md_size(int stripe_count)
+{
+       struct lmv_stripe_md *lsm;
+
+       return sizeof(*lsm) + stripe_count * sizeof(lsm->lsm_md_oinfo[0]);
+}
+
+int lmv_name_to_stripe_index(enum lmv_hash_type hashtype,
+                            unsigned int max_mdt_index,
+                            const char *name, int namelen);
+
+static inline const struct lmv_oinfo *
+lsm_name_to_stripe_info(const struct lmv_stripe_md *lsm, const char *name,
+                       int namelen)
+{
+       int stripe_index;
+
+       stripe_index = lmv_name_to_stripe_index(lsm->lsm_md_hash_type,
+                                               lsm->lsm_md_stripe_count,
+                                               name, namelen);
+       if (stripe_index < 0)
+               return ERR_PTR(stripe_index);
+
+       LASSERTF(stripe_index < lsm->lsm_md_stripe_count,
+                "stripe_index = %d, stripe_count = %d hash_type = %x"
+                "name = %.*s\n", stripe_index, lsm->lsm_md_stripe_count,
+                lsm->lsm_md_hash_type, namelen, 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);
 /* lproc_lmv.c */
 #ifdef LPROCFS
-void lprocfs_lmv_init_vars(struct lprocfs_static_vars *lvars);
-#else
-static inline void lprocfs_lmv_init_vars(struct lprocfs_static_vars *lvars)
-{
-        memset(lvars, 0, sizeof(*lvars));
-}
+extern struct lprocfs_seq_vars lprocfs_lmv_obd_vars[];
 #endif
 extern struct file_operations lmv_proc_target_fops;