LU-3105 osd: remove capa related stuff from servers

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

diff --git a/lustre/obdclass/llog_test.c b/lustre/obdclass/llog_test.c
index 403e571..902bbaa 100644 (file)
--- a/lustre/obdclass/llog_test.c
+++ b/lustre/obdclass/llog_test.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, 2013, Intel Corporation.
+ * Copyright (c) 2012, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -518,7 +518,7 @@ static int llog_test_5(const struct lu_env *env, struct obd_device *obd)
        cancel_count = 0;
        rc = llog_cat_process(env, llh, llog_cancel_rec_cb, "foobar", 0, 0);
        if (rc != -LLOG_EEMPTY) {
-               CERROR("5c: process with cat_cancel_cb failed: %d\n", rc);
+               CERROR("5c: process with llog_cancel_rec_cb failed: %d\n", rc);
                GOTO(out, rc);
        }
 
@@ -837,8 +837,9 @@ static int llog_test_7(const struct lu_env *env, struct obd_device *obd)
        }
 
        CWARN("7e: test llog_changelog_rec\n");
+       /* Direct access to cr_do_not_use: peculiar case for this test */
        llog_records.lcr.cr_hdr.lrh_len = sizeof(llog_records.lcr);
-       llog_records.lcr.cr_tail.lrt_len = sizeof(llog_records.lcr);
+       llog_records.lcr.cr_do_not_use.lrt_len = sizeof(llog_records.lcr);
        llog_records.lcr.cr_hdr.lrh_type = CHANGELOG_REC;
 
        rc = llog_test_7_sub(env, ctxt);
@@ -885,7 +886,7 @@ static int llog_truncate(const struct lu_env *env, struct dt_object *o)
        d = lu2dt_dev(o->do_lu.lo_dev);
        LASSERT(d);
 
-       rc = dt_attr_get(env, o, &la, NULL);
+       rc = dt_attr_get(env, o, &la);
        if (rc)
                RETURN(rc);
 
@@ -914,11 +915,11 @@ static int llog_truncate(const struct lu_env *env, struct dt_object *o)
        if (rc)
                GOTO(stop, rc);
 
-       rc = dt_punch(env, o, la.la_size, OBD_OBJECT_EOF, th, BYPASS_CAPA);
+       rc = dt_punch(env, o, la.la_size, OBD_OBJECT_EOF, th);
        if (rc)
                GOTO(stop, rc);
 
-       rc = dt_attr_set(env, o, &la, th, BYPASS_CAPA);
+       rc = dt_attr_set(env, o, &la, th);
        if (rc)
                GOTO(stop, rc);
 
@@ -969,7 +970,7 @@ static int llog_test_8(const struct lu_env *env, struct obd_device *obd)
        plain_counter = 0;
        rc = llog_cat_process(env, llh, test_8_cb, "foobar", 0, 0);
        if (rc != 0) {
-               CERROR("5a: process with cat_cancel_cb failed: %d\n", rc);
+               CERROR("5a: process with test_8_cb failed: %d\n", rc);
                GOTO(out, rc);
        }
        orig_counter = plain_counter;
@@ -1046,7 +1047,7 @@ static int llog_test_8(const struct lu_env *env, struct obd_device *obd)
        plain_counter = 0;
        rc = llog_cat_process(env, llh, test_8_cb, "foobar", 0, 0);
        if (rc != 0) {
-               CERROR("8d: process with cat_cancel_cb failed: %d\n", rc);
+               CERROR("8d: process with test_8_cb failed: %d\n", rc);
                GOTO(out, rc);
        }