block: Fix writeback throttling W=1 compiler warnings

[linux-2.6-block.git] / include / trace / events / wbt.h

diff --git a/include/trace/events/wbt.h b/include/trace/events/wbt.h
index b048694070e2c20c8a02dc99bc0070e20e02ad02..37342a13c9cb9372f849f2e3d3d5c75bf7c7eb6b 100644 (file)
--- a/include/trace/events/wbt.h
+++ b/include/trace/events/wbt.h
@@ -33,7 +33,8 @@ TRACE_EVENT(wbt_stat,
        ),
 
        TP_fast_assign(
-               strncpy(__entry->name, dev_name(bdi->dev), 32);
+               strlcpy(__entry->name, dev_name(bdi->dev),
+                       ARRAY_SIZE(__entry->name));
                __entry->rmean          = stat[0].mean;
                __entry->rmin           = stat[0].min;
                __entry->rmax           = stat[0].max;
@@ -67,7 +68,8 @@ TRACE_EVENT(wbt_lat,
        ),
 
        TP_fast_assign(
-               strncpy(__entry->name, dev_name(bdi->dev), 32);
+               strlcpy(__entry->name, dev_name(bdi->dev),
+                       ARRAY_SIZE(__entry->name));
                __entry->lat = div_u64(lat, 1000);
        ),
 
@@ -103,7 +105,8 @@ TRACE_EVENT(wbt_step,
        ),
 
        TP_fast_assign(
-               strncpy(__entry->name, dev_name(bdi->dev), 32);
+               strlcpy(__entry->name, dev_name(bdi->dev),
+                       ARRAY_SIZE(__entry->name));
                __entry->msg    = msg;
                __entry->step   = step;
                __entry->window = div_u64(window, 1000);
@@ -138,7 +141,8 @@ TRACE_EVENT(wbt_timer,
        ),
 
        TP_fast_assign(
-               strncpy(__entry->name, dev_name(bdi->dev), 32);
+               strlcpy(__entry->name, dev_name(bdi->dev),
+                       ARRAY_SIZE(__entry->name));
                __entry->status         = status;
                __entry->step           = step;
                __entry->inflight       = inflight;