diff options
| author | Dmitry Monakhov <dmonakhov@openvz.org> | 2015-04-13 14:31:34 +0200 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-01-06 18:42:11 +0100 |
| commit | 424081f3c881ca3aef50cfa571e91863c10d952a (patch) | |
| tree | d34ecd25828bc52fa998fcabfeaba11bf55c55d5 | |
| parent | poll: plug an unused argument to do_poll (diff) | |
| download | linux-424081f3c881ca3aef50cfa571e91863c10d952a.tar.xz linux-424081f3c881ca3aef50cfa571e91863c10d952a.zip | |
fs: use gendisk->disk_name where possible
gendisk with part==0 is obviously gendisk->disk_name.
Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -rw-r--r-- | fs/block_dev.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/fs/block_dev.c b/fs/block_dev.c index 44d4a1e9244e..01b8e0d4b4ff 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c @@ -1042,12 +1042,9 @@ EXPORT_SYMBOL_GPL(bd_unlink_disk_holder); static void flush_disk(struct block_device *bdev, bool kill_dirty) { if (__invalidate_device(bdev, kill_dirty)) { - char name[BDEVNAME_SIZE] = ""; - - if (bdev->bd_disk) - disk_name(bdev->bd_disk, 0, name); printk(KERN_WARNING "VFS: busy inodes on changed media or " - "resized disk %s\n", name); + "resized disk %s\n", + bdev->bd_disk ? bdev->bd_disk->disk_name : ""); } if (!bdev->bd_disk) @@ -1071,12 +1068,9 @@ void check_disk_size_change(struct gendisk *disk, struct block_device *bdev) disk_size = (loff_t)get_capacity(disk) << 9; bdev_size = i_size_read(bdev->bd_inode); if (disk_size != bdev_size) { - char name[BDEVNAME_SIZE]; - - disk_name(disk, 0, name); printk(KERN_INFO "%s: detected capacity change from %lld to %lld\n", - name, bdev_size, disk_size); + disk->disk_name, bdev_size, disk_size); i_size_write(bdev->bd_inode, disk_size); flush_disk(bdev, false); } |