mm: memcontrol: move kmem accounting code to CONFIG_MEMCG

[cascardo/linux.git] / fs / super.c

diff --git a/fs/super.c b/fs/super.c
index 954aeb8..1182af8 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) {
@@ -1199,7 +1197,7 @@ int __sb_start_write(struct super_block *sb, int level, bool wait)
        else
                ret = percpu_down_read_trylock(sb->s_writers.rw_sem + level-1);
 
-       WARN_ON(force_trylock & !ret);
+       WARN_ON(force_trylock && !ret);
        return ret;
 }
 EXPORT_SYMBOL(__sb_start_write);