Merge branches 'perf-urgent-for-linus' and 'timers-urgent-for-linus' of git://git...

[firefly-linux-kernel-4.4.55.git] / drivers / scsi / scsi_debug.c

diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
index 113232135d279615390affa59e51729a1d7d1e56..1f8e2dc9c616a0b7e02559537c05b109123b5b80 100644 (file)
--- a/drivers/scsi/scsi_debug.c
+++ b/drivers/scsi/scsi_debug.c
@@ -4658,10 +4658,10 @@ static ssize_t map_show(struct device_driver *ddp, char *buf)
                return scnprintf(buf, PAGE_SIZE, "0-%u\n",
                                 sdebug_store_sectors);
 
-       count = bitmap_scnlistprintf(buf, PAGE_SIZE, map_storep, map_size);
-
+       count = scnprintf(buf, PAGE_SIZE - 1, "%*pbl",
+                         (int)map_size, map_storep);
        buf[count++] = '\n';
-       buf[count++] = 0;
+       buf[count] = '\0';
 
        return count;
 }