X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Flov%2Flovsub_dev.c;h=c694c668fa2ce3a472cedb8e6ebd75ed4e707904;hp=ec646d533c389be7cbc6fa102d4412e262614251;hb=0ab950762cdec28636b6033c50a2e563c28ba954;hpb=576f1994ae796a21fd4e4646102cdee64fdf5f83

diff --git a/lustre/lov/lovsub_dev.c b/lustre/lov/lovsub_dev.c
index ec646d5..c694c66 100644
--- a/lustre/lov/lovsub_dev.c
+++ b/lustre/lov/lovsub_dev.c
@@ -15,11 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -27,7 +23,7 @@
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2013, Intel Corporation.
+ * Copyright (c) 2013, 2015, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -53,100 +49,96 @@
  */
 
 static int lovsub_device_init(const struct lu_env *env, struct lu_device *d,
-                              const char *name, struct lu_device *next)
+			      const char *name, struct lu_device *next)
 {
-        struct lovsub_device  *lsd = lu2lovsub_dev(d);
-        struct lu_device_type *ldt;
-        int rc;
-
-        ENTRY;
-        next->ld_site = d->ld_site;
-        ldt = next->ld_type;
-        LASSERT(ldt != NULL);
-        rc = ldt->ldt_ops->ldto_device_init(env, next, ldt->ldt_name, NULL);
-        if (rc) {
-                next->ld_site = NULL;
-                RETURN(rc);
-        }
-
-        lu_device_get(next);
-        lu_ref_add(&next->ld_reference, "lu-stack", &lu_site_init);
-        lsd->acid_next = lu2cl_dev(next);
-        RETURN(rc);
+	struct lovsub_device  *lsd = lu2lovsub_dev(d);
+	struct lu_device_type *ldt;
+	int rc;
+
+	ENTRY;
+	next->ld_site = d->ld_site;
+	ldt = next->ld_type;
+	LASSERT(ldt != NULL);
+	rc = ldt->ldt_ops->ldto_device_init(env, next, ldt->ldt_name, NULL);
+	if (rc) {
+		next->ld_site = NULL;
+		RETURN(rc);
+	}
+
+	lu_device_get(next);
+	lu_ref_add(&next->ld_reference, "lu-stack", &lu_site_init);
+	lsd->acid_next = lu2cl_dev(next);
+	RETURN(rc);
 }
 
 static struct lu_device *lovsub_device_fini(const struct lu_env *env,
-                                            struct lu_device *d)
+					    struct lu_device *d)
 {
-        struct lu_device *next;
-        struct lovsub_device *lsd;
-
-        ENTRY;
-        lsd = lu2lovsub_dev(d);
-        next = cl2lu_dev(lsd->acid_next);
-        lsd->acid_super = NULL;
-        lsd->acid_next = NULL;
-        RETURN(next);
+	struct lu_device *next;
+	struct lovsub_device *lsd;
+
+	ENTRY;
+	lsd = lu2lovsub_dev(d);
+	next = cl2lu_dev(lsd->acid_next);
+	lsd->acid_next = NULL;
+	RETURN(next);
 }
 
 static struct lu_device *lovsub_device_free(const struct lu_env *env,
 					    struct lu_device *d)
 {
-	struct lovsub_device *lsd  = lu2lovsub_dev(d);
-	struct lu_device     *next = cl2lu_dev(lsd->acid_next);
+	struct lovsub_device *lsd = lu2lovsub_dev(d);
+	struct lu_device *next = cl2lu_dev(lsd->acid_next);
 
-	if (atomic_read(&d->ld_ref) && d->ld_site) {
-		LIBCFS_DEBUG_MSG_DATA_DECL(msgdata, D_ERROR, NULL);
-		lu_site_print(env, d->ld_site, &msgdata, lu_cdebug_printer);
-	}
+	lu_site_print(env, d->ld_site, &d->ld_ref, D_ERROR, lu_cdebug_printer);
 	cl_device_fini(lu2cl_dev(d));
 	OBD_FREE_PTR(lsd);
 	return next;
 }
 
 static const struct lu_device_operations lovsub_lu_ops = {
-        .ldo_object_alloc      = lovsub_object_alloc,
-        .ldo_process_config    = NULL,
-        .ldo_recovery_complete = NULL
+	.ldo_object_alloc      = lovsub_object_alloc,
+	.ldo_process_config    = NULL,
+	.ldo_recovery_complete = NULL
 };
 
 static struct lu_device *lovsub_device_alloc(const struct lu_env *env,
-                                             struct lu_device_type *t,
-                                             struct lustre_cfg *cfg)
+					     struct lu_device_type *t,
+					     struct lustre_cfg *cfg)
 {
-        struct lu_device     *d;
-        struct lovsub_device *lsd;
-
-        OBD_ALLOC_PTR(lsd);
-        if (lsd != NULL) {
-                int result;
-
-                result = cl_device_init(&lsd->acid_cl, t);
-                if (result == 0) {
-                        d = lovsub2lu_dev(lsd);
-                        d->ld_ops         = &lovsub_lu_ops;
-                } else
-                        d = ERR_PTR(result);
-        } else
-                d = ERR_PTR(-ENOMEM);
-        return d;
+	struct lu_device *d;
+	struct lovsub_device *lsd;
+
+	OBD_ALLOC_PTR(lsd);
+	if (lsd) {
+		int result;
+
+		result = cl_device_init(&lsd->acid_cl, t);
+		if (result == 0) {
+			d = lovsub2lu_dev(lsd);
+			d->ld_ops         = &lovsub_lu_ops;
+		} else
+			d = ERR_PTR(result);
+	} else
+		d = ERR_PTR(-ENOMEM);
+	return d;
 }
 
 static const struct lu_device_type_operations lovsub_device_type_ops = {
-        .ldto_device_alloc = lovsub_device_alloc,
-        .ldto_device_free  = lovsub_device_free,
+	.ldto_device_alloc = lovsub_device_alloc,
+	.ldto_device_free = lovsub_device_free,
 
-        .ldto_device_init    = lovsub_device_init,
-        .ldto_device_fini    = lovsub_device_fini
+	.ldto_device_init = lovsub_device_init,
+	.ldto_device_fini = lovsub_device_fini
 };
 
 #define LUSTRE_LOVSUB_NAME         "lovsub"
 
 struct lu_device_type lovsub_device_type = {
-        .ldt_tags     = LU_DEVICE_CL,
-        .ldt_name     = LUSTRE_LOVSUB_NAME,
-        .ldt_ops      = &lovsub_device_type_ops,
-        .ldt_ctx_tags = LCT_CL_THREAD
+	.ldt_tags     = LU_DEVICE_CL,
+	.ldt_name     = LUSTRE_LOVSUB_NAME,
+	.ldt_ops      = &lovsub_device_type_ops,
+	.ldt_ctx_tags = LCT_CL_THREAD
 };