diff options
| author | Christoph Hellwig | 2017-06-13 11:45:14 +0200 |
|---|---|---|
| committer | Christoph Hellwig | 2017-06-13 11:45:14 +0200 |
| commit | fdd050b5b3c96813ae6756ed68157d32ba31b9f2 (patch) | |
| tree | ca1a216730e32471cd17886d9de1902228bc340c /mm | |
| parent | f06345add95f388519e83ec398134853e0f64ac9 (diff) | |
| parent | 87085ff2e90ecfa91f8bb0cb0ce19ea661bd6f83 (diff) | |
Merge branch 'uuid-types' of bombadil.infradead.org:public_git/uuid into nvme-base
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/cleancache.c | 2 | ||||
| -rw-r--r-- | mm/shmem.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/mm/cleancache.c b/mm/cleancache.c index ba5d8f3e6d68..f7b9fdc79d97 100644 --- a/mm/cleancache.c +++ b/mm/cleancache.c @@ -130,7 +130,7 @@ void __cleancache_init_shared_fs(struct super_block *sb) int pool_id = CLEANCACHE_NO_BACKEND_SHARED; if (cleancache_ops) { - pool_id = cleancache_ops->init_shared_fs(sb->s_uuid, PAGE_SIZE); + pool_id = cleancache_ops->init_shared_fs(&sb->s_uuid, PAGE_SIZE); if (pool_id < 0) pool_id = CLEANCACHE_NO_POOL; } diff --git a/mm/shmem.c b/mm/shmem.c index e67d6ba4e98e..391f2dcca727 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -75,6 +75,7 @@ static struct vfsmount *shm_mnt; #include <uapi/linux/memfd.h> #include <linux/userfaultfd_k.h> #include <linux/rmap.h> +#include <linux/uuid.h> #include <linux/uaccess.h> #include <asm/pgtable.h> @@ -3761,6 +3762,7 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent) #ifdef CONFIG_TMPFS_POSIX_ACL sb->s_flags |= MS_POSIXACL; #endif + uuid_gen(&sb->s_uuid); inode = shmem_get_inode(sb, NULL, S_IFDIR | sbinfo->mode, 0, VM_NORESERVE); if (!inode) |