OSDN Git Service

staging: lustre: opencode LIBCFS_ALLOC_ATOMIC calls.
authorNeilBrown <neilb@suse.com>
Tue, 9 Jan 2018 01:19:38 +0000 (12:19 +1100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 9 Jan 2018 14:41:57 +0000 (15:41 +0100)
Just call kzalloc(GFP_ATOMIC) directly.
We don't need the warning on failure.

Signed-off-by: NeilBrown <neilb@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/lustre/lustre/obdclass/lprocfs_status.c

index 85483a3..e1f4ef2 100644 (file)
@@ -1093,7 +1093,7 @@ int lprocfs_stats_alloc_one(struct lprocfs_stats *stats, unsigned int cpuid)
        LASSERT((stats->ls_flags & LPROCFS_STATS_FLAG_NOPERCPU) == 0);
 
        percpusize = lprocfs_stats_counter_size(stats);
-       LIBCFS_ALLOC_ATOMIC(stats->ls_percpu[cpuid], percpusize);
+       stats->ls_percpu[cpuid] = kzalloc(percpusize, GFP_ATOMIC);
        if (stats->ls_percpu[cpuid]) {
                rc = 0;
                if (unlikely(stats->ls_biggest_alloc_num <= cpuid)) {
@@ -1156,7 +1156,7 @@ struct lprocfs_stats *lprocfs_alloc_stats(unsigned int num,
        if ((flags & LPROCFS_STATS_FLAG_NOPERCPU) != 0) {
                /* contains only one set counters */
                percpusize = lprocfs_stats_counter_size(stats);
-               LIBCFS_ALLOC_ATOMIC(stats->ls_percpu[0], percpusize);
+               stats->ls_percpu[0] = kzalloc(percpusize, GFP_ATOMIC);
                if (!stats->ls_percpu[0])
                        goto fail;
                stats->ls_biggest_alloc_num = 1;
@@ -1193,8 +1193,7 @@ void lprocfs_free_stats(struct lprocfs_stats **statsh)
 
        percpusize = lprocfs_stats_counter_size(stats);
        for (i = 0; i < num_entry; i++)
-               if (stats->ls_percpu[i])
-                       LIBCFS_FREE(stats->ls_percpu[i], percpusize);
+               kfree(stats->ls_percpu[i]);
        kvfree(stats->ls_cnt_header);
        kvfree(stats);
 }