LU-12753 tests: wait for mds2 recovery in sanity 278

[fs/lustre-release.git] / libcfs / libcfs / libcfs_mem.c

diff --git a/libcfs/libcfs/libcfs_mem.c b/libcfs/libcfs/libcfs_mem.c
index 95df0d7..3e83f50 100644 (file)
--- a/libcfs/libcfs/libcfs_mem.c
+++ b/libcfs/libcfs/libcfs_mem.c
@@ -22,7 +22,7 @@
  */
 /*
  * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2011, 2012, Whamcloud, Inc.
+ * Copyright (c) 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -31,9 +31,6 @@
  * Author: liang@whamcloud.com
  */
 
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
 #define DEBUG_SUBSYSTEM S_LNET
 
 #include <libcfs/libcfs.h>
@@ -90,7 +87,7 @@ cfs_percpt_alloc(struct cfs_cpt_table *cptab, unsigned int size)
        if (arr == NULL)
                return NULL;
 
-       arr->va_size    = size = CFS_L1_CACHE_ALIGN(size);
+       arr->va_size    = size = L1_CACHE_ALIGN(size);
        arr->va_count   = count;
        arr->va_cptab   = cptab;
 
@@ -122,36 +119,6 @@ cfs_percpt_number(void *vars)
 EXPORT_SYMBOL(cfs_percpt_number);
 
 /*
- * return memory block shadowed from current CPU
- */
-void *
-cfs_percpt_current(void *vars)
-{
-       struct cfs_var_array *arr;
-       int    cpt;
-
-       arr = container_of(vars, struct cfs_var_array, va_ptrs[0]);
-       cpt = cfs_cpt_current(arr->va_cptab, 0);
-       if (cpt < 0)
-               return NULL;
-
-       return arr->va_ptrs[cpt];
-}
-EXPORT_SYMBOL(cfs_percpt_current);
-
-void *
-cfs_percpt_index(void *vars, int idx)
-{
-       struct cfs_var_array *arr;
-
-       arr = container_of(vars, struct cfs_var_array, va_ptrs[0]);
-
-       LASSERT(idx >= 0 && idx < arr->va_count);
-       return arr->va_ptrs[idx];
-}
-EXPORT_SYMBOL(cfs_percpt_index);
-
-/*
  * free variable array, see more detail in cfs_array_alloc
  */
 void