Whamcloud - gitweb
LU-11579 lov: quiet lov_dump_lmm_ console messages
[fs/lustre-release.git] / lustre / lov / lov_pack.c
index bdcf146..3fe19fe 100644 (file)
@@ -23,7 +23,7 @@
  * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2015, Intel Corporation.
+ * Copyright (c) 2011, 2017, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -38,9 +38,6 @@
 
 #define DEBUG_SUBSYSTEM S_LOV
 
-#include <lustre/lustre_idl.h>
-#include <lustre/lustre_user.h>
-
 #include <lustre_net.h>
 #include <lustre_swab.h>
 #include <obd.h>
 void lov_dump_lmm_common(int level, void *lmmp)
 {
        struct lov_mds_md *lmm = lmmp;
-       struct ost_id   oi;
+       struct ost_id oi;
 
        lmm_oi_le_to_cpu(&oi, &lmm->lmm_oi);
-       CDEBUG(level, "objid "DOSTID", magic 0x%08x, pattern %#x\n",
-              POSTID(&oi), le32_to_cpu(lmm->lmm_magic),
-              le32_to_cpu(lmm->lmm_pattern));
-       CDEBUG(level, "stripe_size %u, stripe_count %u, layout_gen %u\n",
-              le32_to_cpu(lmm->lmm_stripe_size),
-              le16_to_cpu(lmm->lmm_stripe_count),
-              le16_to_cpu(lmm->lmm_layout_gen));
+       CDEBUG_LIMIT(level, "objid "DOSTID", magic 0x%08x, pattern %#x\n",
+                    POSTID(&oi), le32_to_cpu(lmm->lmm_magic),
+                    le32_to_cpu(lmm->lmm_pattern));
+       CDEBUG_LIMIT(level, "stripe_size %u, stripe_count %u, layout_gen %u\n",
+                    le32_to_cpu(lmm->lmm_stripe_size),
+                    le16_to_cpu(lmm->lmm_stripe_count),
+                    le16_to_cpu(lmm->lmm_layout_gen));
 }
 
 static void lov_dump_lmm_objects(int level, struct lov_ost_data *lod,
-                                 int stripe_count)
+                                int stripe_count)
 {
        int i;
 
        if (stripe_count > LOV_V1_INSANE_STRIPE_COUNT) {
-               CDEBUG(level, "bad stripe_count %u > max_stripe_count %u\n",
-                      stripe_count, LOV_V1_INSANE_STRIPE_COUNT);
+               CDEBUG_LIMIT(level,
+                            "bad stripe_count %u > max_stripe_count %u\n",
+                            stripe_count, LOV_V1_INSANE_STRIPE_COUNT);
                return;
        }
 
        for (i = 0; i < stripe_count; ++i, ++lod) {
-               struct ost_id   oi;
+               struct ost_id oi;
 
                ostid_le_to_cpu(&lod->l_ost_oi, &oi);
-               CDEBUG(level, "stripe %u idx %u subobj "DOSTID"\n", i,
-                      le32_to_cpu(lod->l_ost_idx), POSTID(&oi));
+               CDEBUG_LIMIT(level, "stripe %u idx %u subobj "DOSTID"\n", i,
+                            le32_to_cpu(lod->l_ost_idx), POSTID(&oi));
        }
 }
 
 void lov_dump_lmm_v1(int level, struct lov_mds_md_v1 *lmm)
 {
-        lov_dump_lmm_common(level, lmm);
-        lov_dump_lmm_objects(level, lmm->lmm_objects,
-                             le16_to_cpu(lmm->lmm_stripe_count));
+       lov_dump_lmm_common(level, lmm);
+       lov_dump_lmm_objects(level, lmm->lmm_objects,
+                            le16_to_cpu(lmm->lmm_stripe_count));
 }
 
 void lov_dump_lmm_v3(int level, struct lov_mds_md_v3 *lmm)
 {
-        lov_dump_lmm_common(level, lmm);
-        CDEBUG(level,"pool_name "LOV_POOLNAMEF"\n", lmm->lmm_pool_name);
-        lov_dump_lmm_objects(level, lmm->lmm_objects,
-                             le16_to_cpu(lmm->lmm_stripe_count));
+       lov_dump_lmm_common(level, lmm);
+       CDEBUG_LIMIT(level, "pool_name "LOV_POOLNAMEF"\n", lmm->lmm_pool_name);
+       lov_dump_lmm_objects(level, lmm->lmm_objects,
+                            le16_to_cpu(lmm->lmm_stripe_count));
 }
 
 void lov_dump_lmm(int level, void *lmm)
@@ -113,8 +111,8 @@ void lov_dump_lmm(int level, void *lmm)
                lov_dump_lmm_v3(level, (struct lov_mds_md_v3 *)lmm);
                break;
        default:
-               CDEBUG(level, "unrecognized lmm_magic %x, assuming %x\n",
-                      magic, LOV_MAGIC_V1);
+               CDEBUG_LIMIT(level, "unrecognized lmm_magic %x, assuming %x\n",
+                            magic, LOV_MAGIC_V1);
                lov_dump_lmm_common(level, lmm);
                break;
        }
@@ -136,6 +134,7 @@ ssize_t lov_lsm_pack_v1v3(const struct lov_stripe_md *lsm, void *buf,
        struct lov_ost_data_v1 *lmm_objects;
        size_t lmm_size;
        unsigned int i;
+
        ENTRY;
 
        lmm_size = lov_mds_md_size(lsm->lsm_entries[0]->lsme_stripe_count,
@@ -146,7 +145,8 @@ ssize_t lov_lsm_pack_v1v3(const struct lov_stripe_md *lsm, void *buf,
        if (buf_size < lmm_size)
                RETURN(-ERANGE);
 
-       /* lmmv1 and lmmv3 point to the same struct and have the
+       /*
+        * lmmv1 and lmmv3 point to the same struct and have the
         * same first fields
         */
        lmmv1->lmm_magic = cpu_to_le32(lsm->lsm_magic);
@@ -194,6 +194,7 @@ ssize_t lov_lsm_pack(const struct lov_stripe_md *lsm, void *buf,
        unsigned int offset;
        unsigned int size;
        unsigned int i;
+
        ENTRY;
 
        if (lsm->lsm_magic == LOV_MAGIC_V1 || lsm->lsm_magic == LOV_MAGIC_V3)
@@ -209,6 +210,8 @@ ssize_t lov_lsm_pack(const struct lov_stripe_md *lsm, void *buf,
        lcmv1->lcm_magic = cpu_to_le32(lsm->lsm_magic);
        lcmv1->lcm_size = cpu_to_le32(lmm_size);
        lcmv1->lcm_layout_gen = cpu_to_le32(lsm->lsm_layout_gen);
+       lcmv1->lcm_flags = cpu_to_le16(lsm->lsm_flags);
+       lcmv1->lcm_mirror_count = cpu_to_le16(lsm->lsm_mirror_count);
        lcmv1->lcm_entry_count = cpu_to_le16(lsm->lsm_entry_count);
 
        offset = sizeof(*lcmv1) + sizeof(*lcme) * lsm->lsm_entry_count;
@@ -216,13 +219,16 @@ ssize_t lov_lsm_pack(const struct lov_stripe_md *lsm, void *buf,
        for (entry = 0; entry < lsm->lsm_entry_count; entry++) {
                struct lov_stripe_md_entry *lsme;
                struct lov_mds_md *lmm;
-               __u16 stripecnt;
+               __u16 stripe_count;
 
                lsme = lsm->lsm_entries[entry];
                lcme = &lcmv1->lcm_entries[entry];
 
                lcme->lcme_id = cpu_to_le32(lsme->lsme_id);
                lcme->lcme_flags = cpu_to_le32(lsme->lsme_flags);
+               if (lsme->lsme_flags & LCME_FL_NOSYNC)
+                       lcme->lcme_timestamp =
+                               cpu_to_le64(lsme->lsme_timestamp);
                lcme->lcme_extent.e_start =
                        cpu_to_le64(lsme->lsme_extent.e_start);
                lcme->lcme_extent.e_end =
@@ -251,11 +257,11 @@ ssize_t lov_lsm_pack(const struct lov_stripe_md *lsm, void *buf,
 
                if (lsme_inited(lsme) &&
                    !(lsme->lsme_pattern & LOV_PATTERN_F_RELEASED))
-                       stripecnt = lsme->lsme_stripe_count;
+                       stripe_count = lsme->lsme_stripe_count;
                else
-                       stripecnt = 0;
+                       stripe_count = 0;
 
-               for (i = 0; i < stripecnt; i++) {
+               for (i = 0; i < stripe_count; i++) {
                        struct lov_oinfo *loi = lsme->lsme_oinfo[i];
 
                        ostid_cpu_to_le(&loi->loi_oi, &lmm_objects[i].l_ost_oi);
@@ -265,7 +271,7 @@ ssize_t lov_lsm_pack(const struct lov_stripe_md *lsm, void *buf,
                                        cpu_to_le32(loi->loi_ost_idx);
                }
 
-               size = lov_mds_md_size(stripecnt, lsme->lsme_magic);
+               size = lov_mds_md_size(stripe_count, lsme->lsme_magic);
                lcme->lcme_size = cpu_to_le32(size);
                offset += size;
        } /* for each layout component */
@@ -274,28 +280,30 @@ ssize_t lov_lsm_pack(const struct lov_stripe_md *lsm, void *buf,
 }
 
 /* Find the max stripecount we should use */
-__u16 lov_get_stripecnt(struct lov_obd *lov, __u32 magic, __u16 stripe_count)
+__u16 lov_get_stripe_count(struct lov_obd *lov, __u32 magic, __u16 stripe_count)
 {
-        __u32 max_stripes = LOV_MAX_STRIPE_COUNT_OLD;
-
-        if (!stripe_count)
-                stripe_count = lov->desc.ld_default_stripe_count;
-        if (stripe_count > lov->desc.ld_active_tgt_count)
-                stripe_count = lov->desc.ld_active_tgt_count;
-        if (!stripe_count)
-                stripe_count = 1;
-
-        /* stripe count is based on whether ldiskfs can handle
-         * larger EA sizes */
-        if (lov->lov_ocd.ocd_connect_flags & OBD_CONNECT_MAX_EASIZE &&
-            lov->lov_ocd.ocd_max_easize)
+       __u32 max_stripes = LOV_MAX_STRIPE_COUNT_OLD;
+
+       if (!stripe_count)
+               stripe_count = lov->desc.ld_default_stripe_count;
+       if (stripe_count > lov->desc.ld_active_tgt_count)
+               stripe_count = lov->desc.ld_active_tgt_count;
+       if (!stripe_count)
+               stripe_count = 1;
+
+       /*
+        * stripe count is based on whether ldiskfs can handle
+        * larger EA sizes
+        */
+       if (lov->lov_ocd.ocd_connect_flags & OBD_CONNECT_MAX_EASIZE &&
+           lov->lov_ocd.ocd_max_easize)
                max_stripes = lov_mds_md_max_stripe_count(
                        lov->lov_ocd.ocd_max_easize, magic);
 
-        if (stripe_count > max_stripes)
-                stripe_count = max_stripes;
+       if (stripe_count > max_stripes)
+               stripe_count = max_stripes;
 
-        return stripe_count;
+       return stripe_count;
 }
 
 int lov_free_memmd(struct lov_stripe_md **lsmp)
@@ -312,7 +320,8 @@ int lov_free_memmd(struct lov_stripe_md **lsmp)
        return refc;
 }
 
-/* Unpack LOV object metadata from disk storage.  It is packed in LE byte
+/*
+ * Unpack LOV object metadata from disk storage.  It is packed in LE byte
  * order and is opaque to the networking layer.
  */
 struct lov_stripe_md *lov_unpackmd(struct lov_obd *lov, void *buf,
@@ -321,6 +330,7 @@ struct lov_stripe_md *lov_unpackmd(struct lov_obd *lov, void *buf,
        const struct lsm_operations *op;
        struct lov_stripe_md *lsm;
        u32 magic;
+
        ENTRY;
 
        if (buf_size < sizeof(magic))
@@ -328,7 +338,7 @@ struct lov_stripe_md *lov_unpackmd(struct lov_obd *lov, void *buf,
 
        magic = le32_to_cpu(*(u32 *)buf);
        op = lsm_op_find(magic);
-       if (op == NULL)
+       if (!op)
                RETURN(ERR_PTR(-EINVAL));
 
        lsm = op->lsm_unpackmd(lov, buf, buf_size);
@@ -336,7 +346,8 @@ struct lov_stripe_md *lov_unpackmd(struct lov_obd *lov, void *buf,
        RETURN(lsm);
 }
 
-/* Retrieve object striping information.
+/*
+ * Retrieve object striping information.
  *
  * @lump is a pointer to an in-core struct with lmm_ost_count indicating
  * the maximum number of OST indices which will fit in the user buffer.
@@ -352,10 +363,11 @@ int lov_getstripe(const struct lu_env *env, struct lov_object *obj,
        /* we use lov_user_md_v3 because it is larger than lov_user_md_v1 */
        struct lov_mds_md *lmmk, *lmm;
        struct lov_user_md_v1 lum;
-       size_t  lmmk_size;
-       ssize_t lmm_size, lum_size = 0;
+       size_t lmmk_size;
+       ssize_t lmm_size, lum_size = 0;
        static bool printed;
-       int     rc = 0;
+       int rc = 0;
+
        ENTRY;
 
        if (lsm->lsm_magic != LOV_MAGIC_V1 && lsm->lsm_magic != LOV_MAGIC_V3 &&
@@ -376,7 +388,7 @@ int lov_getstripe(const struct lu_env *env, struct lov_object *obj,
        lmmk_size = lov_comp_md_size(lsm);
 
        OBD_ALLOC_LARGE(lmmk, lmmk_size);
-       if (lmmk == NULL)
+       if (!lmmk)
                GOTO(out, rc = -ENOMEM);
 
        lmm_size = lov_lsm_pack(lsm, lmmk, lmmk_size);
@@ -396,8 +408,10 @@ int lov_getstripe(const struct lu_env *env, struct lov_object *obj,
                }
        }
 
-       /* Legacy appication passes limited buffer, we need to figure out
-        * the user buffer size by the passed in lmm_stripe_count. */
+       /*
+        * Legacy appication passes limited buffer, we need to figure out
+        * the user buffer size by the passed in lmm_stripe_count.
+        */
        if (copy_from_user(&lum, lump, sizeof(struct lov_user_md_v1)))
                GOTO(out_free, rc = -EFAULT);
 
@@ -409,8 +423,10 @@ int lov_getstripe(const struct lu_env *env, struct lov_object *obj,
        if (lum_size != 0) {
                struct lov_mds_md *comp_md = lmmk;
 
-               /* Legacy app (ADIO for instance) treats the layout as V1/V3
-                * blindly, we'd return a reasonable V1/V3 for them. */
+               /*
+                * Legacy app (ADIO for instance) treats the layout as V1/V3
+                * blindly, we'd return a reasonable V1/V3 for them.
+                */
                if (lmmk->lmm_magic == LOV_MAGIC_COMP_V1) {
                        struct lov_comp_md_v1 *comp_v1;
                        struct cl_object *cl_obj;
@@ -419,10 +435,14 @@ int lov_getstripe(const struct lu_env *env, struct lov_object *obj,
 
                        attr.cat_size = 0;
                        cl_obj = cl_object_top(&obj->lo_cl);
+                       cl_object_attr_lock(cl_obj);
                        cl_object_attr_get(env, cl_obj, &attr);
+                       cl_object_attr_unlock(cl_obj);
 
-                       /* return the last instantiated component if file size
-                        * is non-zero, otherwise, return the last component.*/
+                       /*
+                        * return the last instantiated component if file size
+                        * is non-zero, otherwise, return the last component.
+                        */
                        comp_v1 = (struct lov_comp_md_v1 *)lmmk;
                        i = attr.cat_size == 0 ? comp_v1->lcm_entry_count : 0;
                        for (; i < comp_v1->lcm_entry_count; i++) {