Merge tag 'xfs-for-linus-4.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-drm-fsl-dcu.git] / fs / xfs / xfs_buf.c

diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c
index e143c7b66e356bb927e7f8de70e386cea54c7b23..435c7de42e5f322a82845382ad7e1fa54dfe3d0b 100644 (file)
--- a/fs/xfs/xfs_buf.c
+++ b/fs/xfs/xfs_buf.c
@@ -1649,13 +1649,9 @@ xfs_setsize_buftarg(
        btp->bt_meta_sectormask = sectorsize - 1;
 
        if (set_blocksize(btp->bt_bdev, sectorsize)) {
-               char name[BDEVNAME_SIZE];
-
-               bdevname(btp->bt_bdev, name);
-
                xfs_warn(btp->bt_mount,
-                       "Cannot set_blocksize to %u on device %s",
-                       sectorsize, name);
+                       "Cannot set_blocksize to %u on device %pg",
+                       sectorsize, btp->bt_bdev);
                return -EINVAL;
        }