staging: lustre: Replace printk_ratelimited with pr_warn_ratelimited
authorKonrad Malkowski <konrad.malkowski@gmail.com>
Fri, 26 May 2017 03:01:20 +0000 (23:01 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 3 Jun 2017 08:32:41 +0000 (17:32 +0900)
This patch fixes the checkpoint.pl warning:

WARNING: Prefer printk_ratelimited or pr_<level>_ratelimited to
printk_ratelimit

Signed-off-by: Konrad Malkowski <konrad.malkowski@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/lustre/lnet/libcfs/tracefile.c

index 9599b74..a0efea4 100644 (file)
@@ -191,10 +191,9 @@ cfs_trace_get_tage_try(struct cfs_trace_cpu_data *tcd, unsigned long len)
                } else {
                        tage = cfs_tage_alloc(GFP_ATOMIC);
                        if (unlikely(!tage)) {
-                               if ((!memory_pressure_get() ||
-                                    in_interrupt()) && printk_ratelimit())
-                                       pr_warn("cannot allocate a tage (%ld)\n",
-                                               tcd->tcd_cur_pages);
+                               if (!memory_pressure_get() || in_interrupt())
+                                       pr_warn_ratelimited("cannot allocate a tage (%ld)\n",
+                                                           tcd->tcd_cur_pages);
                                return NULL;
                        }
                }
@@ -229,9 +228,8 @@ static void cfs_tcd_shrink(struct cfs_trace_cpu_data *tcd)
         * from here: this will lead to infinite recursion.
         */
 
-       if (printk_ratelimit())
-               pr_warn("debug daemon buffer overflowed; discarding 10%% of pages (%d of %ld)\n",
-                       pgcount + 1, tcd->tcd_cur_pages);
+       pr_warn_ratelimited("debug daemon buffer overflowed; discarding 10%% of pages (%d of %ld)\n",
+                           pgcount + 1, tcd->tcd_cur_pages);
 
        INIT_LIST_HEAD(&pc.pc_pages);