Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[linux-2.6-block.git] / fs / super.c

diff --git a/fs/super.c b/fs/super.c
index 7ea56de57d4b874a3d3737aa49dafa94715a6ff8..1182af8fd5ff3ede7459305440d50178821c061b 100644 (file)
--- a/fs/super.c
+++ b/fs/super.c
@@ -1012,10 +1012,8 @@ struct dentry *mount_bdev(struct file_system_type *fs_type,
                blkdev_put(bdev, mode);
                down_write(&s->s_umount);
        } else {
-               char b[BDEVNAME_SIZE];
-
                s->s_mode = mode;
-               strlcpy(s->s_id, bdevname(bdev, b), sizeof(s->s_id));
+               snprintf(s->s_id, sizeof(s->s_id), "%pg", bdev);
                sb_set_blocksize(s, block_size(bdev));
                error = fill_super(s, data, flags & MS_SILENT ? 1 : 0);
                if (error) {