Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 85787090 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

fs: switch ->s_uuid to uuid_t 



For some file systems we still memcpy into it, but in various places this
already allows us to use the proper uuid helpers.  More to come..

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarAmir Goldstein <amir73il@gmail.com>
Acked-by: Mimi Zohar <zohar@linux.vnet.ibm.com> (Changes to IMA/EVM)
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
parent 787d8c53

drivers/xen/tmem.c

+3 −3
Original line number Diff line number Diff line
@@ -233,12 +233,12 @@ static int tmem_cleancache_init_fs(size_t pagesize) 
	return xen_tmem_new_pool(uuid_private, 0, pagesize);

}



static int tmem_cleancache_init_shared_fs(char *uuid, size_t pagesize)

static int tmem_cleancache_init_shared_fs(uuid_t *uuid, size_t pagesize)

{

	struct tmem_pool_uuid shared_uuid;



	shared_uuid.uuid_lo = *(u64 *)uuid;

	shared_uuid.uuid_hi = *(u64 *)(&uuid[8]);

	shared_uuid.uuid_lo = *(u64 *)&uuid->b[0];

	shared_uuid.uuid_hi = *(u64 *)&uuid->b[8];

	return xen_tmem_new_pool(shared_uuid, TMEM_POOL_SHARED, pagesize);

}

fs/ext4/super.c

+1 −1
Original line number Diff line number Diff line
@@ -3952,7 +3952,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) 
		sb->s_qcop = &ext4_qctl_operations;

	sb->s_quota_types = QTYPE_MASK_USR | QTYPE_MASK_GRP | QTYPE_MASK_PRJ;

#endif

	memcpy(sb->s_uuid, es->s_uuid, sizeof(es->s_uuid));

	memcpy(&sb->s_uuid, es->s_uuid, sizeof(es->s_uuid));



	INIT_LIST_HEAD(&sbi->s_orphan); /* unlinked but open files */

	mutex_init(&sbi->s_orphan_lock);

fs/f2fs/super.c

+1 −1
Original line number Diff line number Diff line
@@ -1937,7 +1937,7 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent) 
	sb->s_time_gran = 1;

	sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |

		(test_opt(sbi, POSIX_ACL) ? MS_POSIXACL : 0);

	memcpy(sb->s_uuid, raw_super->uuid, sizeof(raw_super->uuid));

	memcpy(&sb->s_uuid, raw_super->uuid, sizeof(raw_super->uuid));



	/* init f2fs-specific super block info */

	sbi->valid_super_block = valid_super_block;

fs/gfs2/ops_fstype.c

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ static void gfs2_sb_in(struct gfs2_sbd *sdp, const void *buf) 


	memcpy(sb->sb_lockproto, str->sb_lockproto, GFS2_LOCKNAME_LEN);

	memcpy(sb->sb_locktable, str->sb_locktable, GFS2_LOCKNAME_LEN);

	memcpy(s->s_uuid, str->sb_uuid, 16);

	memcpy(&s->s_uuid, str->sb_uuid, 16);

}



/**

fs/gfs2/sys.c

+5 −17
Original line number Diff line number Diff line
@@ -71,25 +71,14 @@ static ssize_t fsname_show(struct gfs2_sbd *sdp, char *buf) 
	return snprintf(buf, PAGE_SIZE, "%s\n", sdp->sd_fsname);

}



static int gfs2_uuid_valid(const u8 *uuid)

{

	int i;



	for (i = 0; i < 16; i++) {

		if (uuid[i])

			return 1;

	}

	return 0;

}



static ssize_t uuid_show(struct gfs2_sbd *sdp, char *buf)

{

	struct super_block *s = sdp->sd_vfs;

	const u8 *uuid = s->s_uuid;



	buf[0] = '\0';

	if (!gfs2_uuid_valid(uuid))

	if (uuid_is_null(&s->s_uuid))

		return 0;

	return snprintf(buf, PAGE_SIZE, "%pUB\n", uuid);

	return snprintf(buf, PAGE_SIZE, "%pUB\n", &s->s_uuid);

}



static ssize_t freeze_show(struct gfs2_sbd *sdp, char *buf)
@@ -712,14 +701,13 @@ static int gfs2_uevent(struct kset *kset, struct kobject *kobj, 
{

	struct gfs2_sbd *sdp = container_of(kobj, struct gfs2_sbd, sd_kobj);

	struct super_block *s = sdp->sd_vfs;

	const u8 *uuid = s->s_uuid;



	add_uevent_var(env, "LOCKTABLE=%s", sdp->sd_table_name);

	add_uevent_var(env, "LOCKPROTO=%s", sdp->sd_proto_name);

	if (!test_bit(SDF_NOJOURNALID, &sdp->sd_flags))

		add_uevent_var(env, "JOURNALID=%d", sdp->sd_lockstruct.ls_jid);

	if (gfs2_uuid_valid(uuid))

		add_uevent_var(env, "UUID=%pUB", uuid);

	if (!uuid_is_null(&s->s_uuid))

		add_uevent_var(env, "UUID=%pUB", &s->s_uuid);

	return 0;

}