block: add cond_resched() to potentially long running ioctl discard loop

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / block / genhd.c

diff --git a/block/genhd.c b/block/genhd.c
index 20625eed55116555216cb594c49e4a0c36049675..cdeb5277dfd402ddeefa300d888d8e07b81b8ad9 100644 (file)
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -512,7 +512,7 @@ static void register_disk(struct gendisk *disk)
 
        ddev->parent = disk->driverfs_dev;
 
-       dev_set_name(ddev, disk->disk_name);
+       dev_set_name(ddev, "%s", disk->disk_name);
 
        /* delay uevents, until we scanned partition table */
        dev_set_uevent_suppress(ddev, 1);