LU-1346 libcfs: replace cfs_ memory wrappers

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

diff --git a/libcfs/libcfs/lwt.c b/libcfs/libcfs/lwt.c
index ea5d076..0666b4c 100644 (file)
--- a/libcfs/libcfs/lwt.c
+++ b/libcfs/libcfs/lwt.c
@@ -72,19 +72,19 @@ lwt_lookup_string (int *size, char *knl_ptr,
 
         *size = strnlen (knl_ptr, maxsize - 1) + 1;
 
-        if (user_ptr != NULL) {
-                if (user_size < 4)
-                        return (-EINVAL);
+       if (user_ptr != NULL) {
+               if (user_size < 4)
+                       return -EINVAL;
 
-                if (cfs_copy_to_user (user_ptr, knl_ptr, *size))
-                        return (-EFAULT);
+               if (copy_to_user(user_ptr, knl_ptr, *size))
+                       return -EFAULT;
 
-                /* Did I truncate the string?  */
-                if (knl_ptr[*size - 1] != 0)
-                        cfs_copy_to_user (user_ptr + *size - 4, "...", 4);
-        }
+               /* Did I truncate the string?  */
+               if (knl_ptr[*size - 1] != 0)
+                       copy_to_user(user_ptr + *size - 4, "...", 4);
+       }
 
-        return (0);
+       return 0;
 }
 
 int
@@ -115,7 +115,7 @@ lwt_control (int enable, int clear)
                         continue;
 
                 for (j = 0; j < lwt_pages_per_cpu; j++) {
-                        memset (p->lwtp_events, 0, CFS_PAGE_SIZE);
+                       memset(p->lwtp_events, 0, PAGE_CACHE_SIZE);
 
                         p = cfs_list_entry (p->lwtp_list.next,
                                             lwt_page_t, lwtp_list);
@@ -132,14 +132,14 @@ lwt_control (int enable, int clear)
 }
 
 int
-lwt_snapshot (cfs_cycles_t *now, int *ncpu, int *total_size,
-              void *user_ptr, int user_size)
+lwt_snapshot(cfs_cycles_t *now, int *ncpu, int *total_size,
+            void *user_ptr, int user_size)
 {
-        const int    events_per_page = CFS_PAGE_SIZE / sizeof(lwt_event_t);
-        const int    bytes_per_page = events_per_page * sizeof(lwt_event_t);
-        lwt_page_t  *p;
-        int          i;
-        int          j;
+       const int    events_per_page = PAGE_CACHE_SIZE / sizeof(lwt_event_t);
+       const int    bytes_per_page = events_per_page * sizeof(lwt_event_t);
+       lwt_page_t   *p;
+       int          i;
+       int          j;
 
         if (!cfs_capable(CFS_CAP_SYS_ADMIN))
                 return (-EPERM);
@@ -156,12 +156,12 @@ lwt_snapshot (cfs_cycles_t *now, int *ncpu, int *total_size,
                 p = lwt_cpus[i].lwtc_current_page;
 
                 if (p == NULL)
-                        return (-ENODATA);
+                       return -ENODATA;
 
-                for (j = 0; j < lwt_pages_per_cpu; j++) {
-                        if (cfs_copy_to_user(user_ptr, p->lwtp_events,
-                                             bytes_per_page))
-                                return (-EFAULT);
+               for (j = 0; j < lwt_pages_per_cpu; j++) {
+                       if (copy_to_user(user_ptr, p->lwtp_events,
+                                        bytes_per_page))
+                               return -EFAULT;
 
                         user_ptr = ((char *)user_ptr) + bytes_per_page;
                         p = cfs_list_entry(p->lwtp_list.next,
@@ -186,12 +186,12 @@ lwt_init ()
 
        /* NULL pointers, zero scalars */
        memset (lwt_cpus, 0, sizeof (lwt_cpus));
-        lwt_pages_per_cpu =
-                LWT_MEMORY / (cfs_num_online_cpus() * CFS_PAGE_SIZE);
+       lwt_pages_per_cpu =
+               LWT_MEMORY / (cfs_num_online_cpus() * PAGE_CACHE_SIZE);
 
        for (i = 0; i < cfs_num_online_cpus(); i++)
                for (j = 0; j < lwt_pages_per_cpu; j++) {
-                       struct page *page = alloc_page (GFP_KERNEL);
+                       struct page *page = alloc_page(GFP_KERNEL);
                        lwt_page_t  *lwtp;
 
                        if (page == NULL) {
@@ -210,7 +210,7 @@ lwt_init ()
 
                         lwtp->lwtp_page = page;
                         lwtp->lwtp_events = page_address(page);
-                       memset (lwtp->lwtp_events, 0, CFS_PAGE_SIZE);
+                       memset(lwtp->lwtp_events, 0, PAGE_CACHE_SIZE);
 
                        if (j == 0) {
                                CFS_INIT_LIST_HEAD (&lwtp->lwtp_list);