LU-1154 clio: rename coo_attr_set to coo_attr_update

[fs/lustre-release.git] / lnet / selftest / brw_test.c

diff --git a/lnet/selftest/brw_test.c b/lnet/selftest/brw_test.c
index 5ba70d7..856bf95 100644 (file)
--- a/lnet/selftest/brw_test.c
+++ b/lnet/selftest/brw_test.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, 2013, Intel Corporation.
+ * Copyright (c) 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -50,22 +50,22 @@ CFS_MODULE_PARM(brw_inject_errors, "i", int, 0644,
 static void
 brw_client_fini (sfw_test_instance_t *tsi)
 {
-        srpc_bulk_t     *bulk;
-        sfw_test_unit_t *tsu;
+       srpc_bulk_t     *bulk;
+       sfw_test_unit_t *tsu;
 
-        LASSERT (tsi->tsi_is_client);
+       LASSERT(tsi->tsi_is_client);
 
-        cfs_list_for_each_entry_typed (tsu, &tsi->tsi_units,
-                                       sfw_test_unit_t, tsu_list) {
-                bulk = tsu->tsu_private;
-                if (bulk == NULL) continue;
+       list_for_each_entry(tsu, &tsi->tsi_units, tsu_list) {
+               bulk = tsu->tsu_private;
+               if (bulk == NULL)
+                       continue;
 
-                srpc_free_bulk(bulk);
-                tsu->tsu_private = NULL;
-        }
+               srpc_free_bulk(bulk);
+               tsu->tsu_private = NULL;
+       }
 }
 
-int
+static int
 brw_client_init (sfw_test_instance_t *tsi)
 {
        sfw_session_t    *sn = tsi->tsi_batch->bat_session;
@@ -112,17 +112,16 @@ brw_client_init (sfw_test_instance_t *tsi)
            flags != LST_BRW_CHECK_FULL && flags != LST_BRW_CHECK_SIMPLE)
                return -EINVAL;
 
-       cfs_list_for_each_entry_typed(tsu, &tsi->tsi_units,
-                                     sfw_test_unit_t, tsu_list) {
+       list_for_each_entry(tsu, &tsi->tsi_units, tsu_list) {
                bulk = srpc_alloc_bulk(lnet_cpt_of_nid(tsu->tsu_dest.nid),
                                       npg, len, opc == LST_BRW_READ);
-                if (bulk == NULL) {
-                        brw_client_fini(tsi);
-                        return -ENOMEM;
-                }
+               if (bulk == NULL) {
+                       brw_client_fini(tsi);
+                       return -ENOMEM;
+               }
 
-                tsu->tsu_private = bulk;
-        }
+               tsu->tsu_private = bulk;
+       }
 
        return 0;
 }
@@ -131,7 +130,7 @@ brw_client_init (sfw_test_instance_t *tsi)
 #define BRW_MAGIC       0xeeb0eeb1eeb2eeb3ULL
 #define BRW_MSIZE       sizeof(__u64)
 
-int brw_inject_one_error (void)
+static int brw_inject_one_error(void)
 {
        struct timeval tv;
 
@@ -148,8 +147,8 @@ int brw_inject_one_error (void)
        return brw_inject_errors--;
 }
 
-void
-brw_fill_page (struct page *pg, int pattern, __u64 magic)
+static void
+brw_fill_page(struct page *pg, int pattern, __u64 magic)
 {
        char *addr = page_address(pg);
         int   i;
@@ -178,8 +177,8 @@ brw_fill_page (struct page *pg, int pattern, __u64 magic)
         return;
 }
 
-int
-brw_check_page (struct page *pg, int pattern, __u64 magic)
+static int
+brw_check_page(struct page *pg, int pattern, __u64 magic)
 {
        char  *addr = page_address(pg);
         __u64  data = 0; /* make compiler happy */
@@ -218,8 +217,8 @@ bad_data:
         return 1;
 }
 
-void
-brw_fill_bulk (srpc_bulk_t *bk, int pattern, __u64 magic)
+static void
+brw_fill_bulk(srpc_bulk_t *bk, int pattern, __u64 magic)
 {
         int         i;
        struct page *pg;
@@ -235,8 +234,8 @@ brw_fill_bulk (srpc_bulk_t *bk, int pattern, __u64 magic)
         }
 }
 
-int
-brw_check_bulk (srpc_bulk_t *bk, int pattern, __u64 magic)
+static int
+brw_check_bulk(srpc_bulk_t *bk, int pattern, __u64 magic)
 {
         int         i;
        struct page *pg;
@@ -332,7 +331,7 @@ brw_client_done_rpc (sfw_test_unit_t *tsu, srpc_client_rpc_t *rpc)
                 CERROR ("BRW RPC to %s failed with %d\n",
                         libcfs_id2str(rpc->crpc_dest), rpc->crpc_status);
                 if (!tsi->tsi_stopping) /* rpc could have been aborted */
-                        cfs_atomic_inc(&sn->sn_brw_errors);
+                       atomic_inc(&sn->sn_brw_errors);
                 goto out;
         }
 
@@ -346,7 +345,7 @@ brw_client_done_rpc (sfw_test_unit_t *tsu, srpc_client_rpc_t *rpc)
                 libcfs_id2str(rpc->crpc_dest), reply->brw_status);
 
         if (reply->brw_status != 0) {
-                cfs_atomic_inc(&sn->sn_brw_errors);
+               atomic_inc(&sn->sn_brw_errors);
                 rpc->crpc_status = -(int)reply->brw_status;
                 goto out;
         }
@@ -356,7 +355,7 @@ brw_client_done_rpc (sfw_test_unit_t *tsu, srpc_client_rpc_t *rpc)
         if (brw_check_bulk(&rpc->crpc_bulk, reqst->brw_flags, magic) != 0) {
                 CERROR ("Bulk data from %s is corrupted!\n",
                         libcfs_id2str(rpc->crpc_dest));
-                cfs_atomic_inc(&sn->sn_brw_errors);
+               atomic_inc(&sn->sn_brw_errors);
                 rpc->crpc_status = -EBADMSG;
         }
 
@@ -367,8 +366,8 @@ out:
         return;
 }
 
-void
-brw_server_rpc_done (srpc_server_rpc_t *rpc)
+static void
+brw_server_rpc_done(srpc_server_rpc_t *rpc)
 {
         srpc_bulk_t *blk = rpc->srpc_bulk;
 
@@ -386,8 +385,8 @@ brw_server_rpc_done (srpc_server_rpc_t *rpc)
         sfw_free_pages(rpc);
 }
 
-int
-brw_bulk_ready (srpc_server_rpc_t *rpc, int status)
+static int
+brw_bulk_ready(srpc_server_rpc_t *rpc, int status)
 {
         __u64             magic = BRW_MAGIC;
         srpc_brw_reply_t *reply = &rpc->srpc_replymsg.msg_body.brw_reply;
@@ -422,7 +421,7 @@ brw_bulk_ready (srpc_server_rpc_t *rpc, int status)
         return 0;
 }
 
-int
+static int
 brw_server_handle(struct srpc_server_rpc *rpc)
 {
        struct srpc_service     *sv = rpc->srpc_scd->scd_svc;