LU-1302 llog: structures changes, llog_thread_info

[fs/lustre-release.git] / lustre / obdclass / llog_test.c

diff --git a/lustre/obdclass/llog_test.c b/lustre/obdclass/llog_test.c
index 9f35232..00678c2 100644 (file)
--- a/lustre/obdclass/llog_test.c
+++ b/lustre/obdclass/llog_test.c
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,7 +24,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  */
 /*
@@ -38,9 +36,6 @@
  * Author: Phil Schwan <phil@clusterfs.com>
  */
 
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
 #define DEBUG_SUBSYSTEM S_CLASS
 
 #include <linux/module.h>
@@ -658,8 +653,7 @@ static int llog_run_tests(struct obd_device *obd)
 
 static int llog_test_llog_init(struct obd_device *obd,
                                struct obd_llog_group *olg,
-                               struct obd_device *tgt, int count,
-                               struct llog_catid *logid, struct obd_uuid *uuid)
+                               struct obd_device *tgt, int *index)
 {
         int rc;
         ENTRY;
@@ -715,6 +709,7 @@ static int llog_test_setup(struct obd_device *obd, struct lustre_cfg *lcfg)
                 RETURN(-EINVAL);
         }
 
+        /* disk obd */
         tgt = class_name2obd(lustre_cfg_string(lcfg, 1));
         if (!tgt || !tgt->obd_attached || !tgt->obd_set_up) {
                 CERROR("target device not attached or not set up (%s)\n",
@@ -722,11 +717,11 @@ static int llog_test_setup(struct obd_device *obd, struct lustre_cfg *lcfg)
                 RETURN(-EINVAL);
         }
 
-        rc = obd_llog_init(obd, NULL, tgt, 0, NULL, NULL);
+        rc = obd_llog_init(obd, NULL, tgt, NULL);
         if (rc)
                 RETURN(rc);
 
-        llog_test_rand = ll_rand();
+        llog_test_rand = cfs_rand();
 
         rc = llog_run_tests(obd);
         if (rc)