LU-3195 tests: Interop 2.3.0<->2.3.63 sanity-quota test_6

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

diff --git a/lnet/selftest/console.c b/lnet/selftest/console.c
index 2f4b543..04c1a38 100644 (file)
--- a/lnet/selftest/console.c
+++ b/lnet/selftest/console.c
@@ -26,6 +26,8 @@
 /*
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -1855,7 +1857,7 @@ lstcon_session_feats_check(unsigned feats)
                return -EPROTO;
        }
 
-       cfs_spin_lock(&console_session.ses_rpc_lock);
+       spin_lock(&console_session.ses_rpc_lock);
 
        if (!console_session.ses_feats_updated) {
                console_session.ses_feats_updated = 1;
@@ -1865,7 +1867,7 @@ lstcon_session_feats_check(unsigned feats)
        if (console_session.ses_features != feats)
                rc = -EPROTO;
 
-       cfs_spin_unlock(&console_session.ses_rpc_lock);
+       spin_unlock(&console_session.ses_rpc_lock);
 
        if (rc != 0) {
                CERROR("remote features %x do not match with "
@@ -1889,7 +1891,7 @@ lstcon_acceptor_handle (srpc_server_rpc_t *rpc)
 
         sfw_unpack_message(req);
 
-        cfs_mutex_lock(&console_session.ses_mutex);
+       mutex_lock(&console_session.ses_mutex);
 
         jrep->join_sid = console_session.ses_id;
 
@@ -1954,7 +1956,7 @@ out:
         if (grp != NULL)
                 lstcon_group_put(grp);
 
-        cfs_mutex_unlock(&console_session.ses_mutex);
+       mutex_unlock(&console_session.ses_mutex);
 
         return rc;
 }
@@ -1991,7 +1993,7 @@ lstcon_console_init(void)
        console_session.ses_features        = LST_FEATS_MASK;
        console_session.ses_laststamp       = cfs_time_current_sec();
 
-        cfs_mutex_init(&console_session.ses_mutex);
+       mutex_init(&console_session.ses_mutex);
 
         CFS_INIT_LIST_HEAD(&console_session.ses_ndl_list);
         CFS_INIT_LIST_HEAD(&console_session.ses_grp_list);
@@ -2051,7 +2053,7 @@ lstcon_console_fini(void)
 
         libcfs_deregister_ioctl(&lstcon_ioctl_handler);
 
-        cfs_mutex_lock(&console_session.ses_mutex);
+       mutex_lock(&console_session.ses_mutex);
 
         srpc_shutdown_service(&lstcon_acceptor_service);
         srpc_remove_service(&lstcon_acceptor_service);
@@ -2061,7 +2063,7 @@ lstcon_console_fini(void)
 
         lstcon_rpc_module_fini();
 
-        cfs_mutex_unlock(&console_session.ses_mutex);
+       mutex_unlock(&console_session.ses_mutex);
 
         LASSERT (cfs_list_empty(&console_session.ses_ndl_list));
         LASSERT (cfs_list_empty(&console_session.ses_grp_list));