Merge tag 'gpio-v4.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux...

[linux-beck.git] / fs / squashfs / super.c

diff --git a/fs/squashfs/super.c b/fs/squashfs/super.c
index 5056babe00df93249465c22b8b6dc6d0ebc1723d..5e79bfa4f260784dcba925e4d6611585542d88c6 100644 (file)
--- a/fs/squashfs/super.c
+++ b/fs/squashfs/super.c
@@ -80,7 +80,6 @@ static int squashfs_fill_super(struct super_block *sb, void *data, int silent)
 {
        struct squashfs_sb_info *msblk;
        struct squashfs_super_block *sblk = NULL;
-       char b[BDEVNAME_SIZE];
        struct inode *root;
        long long root_inode;
        unsigned short flags;
@@ -124,8 +123,8 @@ static int squashfs_fill_super(struct super_block *sb, void *data, int silent)
        sb->s_magic = le32_to_cpu(sblk->s_magic);
        if (sb->s_magic != SQUASHFS_MAGIC) {
                if (!silent)
-                       ERROR("Can't find a SQUASHFS superblock on %s\n",
-                                               bdevname(sb->s_bdev, b));
+                       ERROR("Can't find a SQUASHFS superblock on %pg\n",
+                                               sb->s_bdev);
                goto failed_mount;
        }
 
@@ -178,7 +177,7 @@ static int squashfs_fill_super(struct super_block *sb, void *data, int silent)
        msblk->inodes = le32_to_cpu(sblk->inodes);
        flags = le16_to_cpu(sblk->flags);
 
-       TRACE("Found valid superblock on %s\n", bdevname(sb->s_bdev, b));
+       TRACE("Found valid superblock on %pg\n", sb->s_bdev);
        TRACE("Inodes are %scompressed\n", SQUASHFS_UNCOMPRESSED_INODES(flags)
                                ? "un" : "");
        TRACE("Data is %scompressed\n", SQUASHFS_UNCOMPRESSED_DATA(flags)
@@ -420,7 +419,8 @@ static int __init init_inodecache(void)
 {
        squashfs_inode_cachep = kmem_cache_create("squashfs_inode_cache",
                sizeof(struct squashfs_inode_info), 0,
-               SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT, init_once);
+               SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|SLAB_ACCOUNT,
+               init_once);
 
        return squashfs_inode_cachep ? 0 : -ENOMEM;
 }