LU-8018 lov: ld_target could be NULL

[fs/lustre-release.git] / lustre / lov / lov_object.c

diff --git a/lustre/lov/lov_object.c b/lustre/lov/lov_object.c
index 4971163..cc05543 100644 (file)
--- a/lustre/lov/lov_object.c
+++ b/lustre/lov/lov_object.c
@@ -271,6 +271,12 @@ static int lov_init_raid0(const struct lu_env *env, struct lov_device *dev,
                        if (result != 0)
                                GOTO(out, result);
 
+                       if (dev->ld_target[ost_idx] == NULL) {
+                               CERROR("%s: OST %04x is not initialized\n",
+                                      lov2obd(dev->ld_lov)->obd_name, ost_idx);
+                               GOTO(out, result = -EIO);
+                       }
+
                        subdev = lovsub2cl_dev(dev->ld_target[ost_idx]);
                        subconf->u.coc_oinfo = oinfo;
                        LASSERTF(subdev != NULL, "not init ost %d\n", ost_idx);
@@ -654,12 +660,16 @@ static enum lov_layout_type lov_type(struct lov_stripe_md *lsm)
 
 static inline void lov_conf_freeze(struct lov_object *lov)
 {
+       CDEBUG(D_INODE, "To take share lov(%p) owner %p/%p\n",
+               lov, lov->lo_owner, current);
        if (lov->lo_owner != current)
                down_read(&lov->lo_type_guard);
 }
 
 static inline void lov_conf_thaw(struct lov_object *lov)
 {
+       CDEBUG(D_INODE, "To release share lov(%p) owner %p/%p\n",
+               lov, lov->lo_owner, current);
        if (lov->lo_owner != current)
                up_read(&lov->lo_type_guard);
 }
@@ -702,10 +712,14 @@ static void lov_conf_lock(struct lov_object *lov)
        down_write(&lov->lo_type_guard);
        LASSERT(lov->lo_owner == NULL);
        lov->lo_owner = current;
+       CDEBUG(D_INODE, "Took exclusive lov(%p) owner %p\n",
+               lov, lov->lo_owner);
 }
 
 static void lov_conf_unlock(struct lov_object *lov)
 {
+       CDEBUG(D_INODE, "To release exclusive lov(%p) owner %p\n",
+               lov, lov->lo_owner);
        lov->lo_owner = NULL;
        up_write(&lov->lo_type_guard);
 }
@@ -734,6 +748,7 @@ static int lov_layout_change(const struct lu_env *unused,
        union lov_layout_state *state = &lov->u;
        const struct lov_layout_operations *old_ops;
        const struct lov_layout_operations *new_ops;
+       struct lov_device *lov_dev = lov_object_dev(lov);
        struct lu_env *env;
        __u16 refcheck;
        int rc;
@@ -766,14 +781,21 @@ static int lov_layout_change(const struct lu_env *unused,
 
        LASSERT(atomic_read(&lov->lo_active_ios) == 0);
 
+       CDEBUG(D_INODE, DFID "Apply new layout lov %p, type %d\n",
+              PFID(lu_object_fid(lov2lu(lov))), lov, llt);
+
        lov->lo_type = LLT_EMPTY;
 
        /* page bufsize fixup */
        cl_object_header(&lov->lo_cl)->coh_page_bufsize -=
                lov_page_slice_fixup(lov, NULL);
 
-       rc = new_ops->llo_init(env, lov_object_dev(lov), lov, lsm, conf, state);
+       rc = new_ops->llo_init(env, lov_dev, lov, lsm, conf, state);
        if (rc != 0) {
+               struct obd_device *obd = lov2obd(lov_dev->ld_lov);
+
+               CERROR("%s: cannot apply new layout on "DFID" : rc = %d\n",
+                      obd->obd_name, PFID(lu_object_fid(lov2lu(lov))), rc);
                new_ops->llo_delete(env, lov, state);
                new_ops->llo_fini(env, lov, state);
                /* this file becomes an EMPTY file. */
@@ -937,6 +959,11 @@ int lov_io_init(const struct lu_env *env, struct cl_object *obj,
                struct cl_io *io)
 {
        CL_IO_SLICE_CLEAN(lov_env_io(env), lis_cl);
+
+       CDEBUG(D_INODE, DFID "io %p type %d ignore/verify layout %d/%d\n",
+              PFID(lu_object_fid(&obj->co_lu)), io, io->ci_type,
+              io->ci_ignore_layout, io->ci_verify_layout);
+
        return LOV_2DISPATCH_MAYLOCK(cl2lov(obj), llo_io_init,
                                     !io->ci_ignore_layout, env, obj, io);
 }