Unverified Commit dd901960 authored by Kent Overstreet's avatar Kent Overstreet Committed by Christian Brauner
Browse files

ovl: convert to super_set_uuid() 



We don't want to be settingc sb->s_uuid directly anymore, as there's a
length field that also has to be set, and this conversion was not
completely trivial.

Acked-by: default avatarAmir Goldstein <amir73il@gmail.com>
Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
Link: https://lore.kernel.org/r/20240207025624.1019754-3-kent.overstreet@linux.dev


Cc: Miklos Szeredi <miklos@szeredi.hu>
Cc: linux-unionfs@vger.kernel.org
Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent a4af51ce

fs/overlayfs/util.c

+11 −7
Original line number Diff line number Diff line
@@ -760,13 +760,14 @@ bool ovl_init_uuid_xattr(struct super_block *sb, struct ovl_fs *ofs, 
			 const struct path *upperpath)

{

	bool set = false;

	uuid_t uuid;

	int res;



	/* Try to load existing persistent uuid */

	res = ovl_path_getxattr(ofs, upperpath, OVL_XATTR_UUID, sb->s_uuid.b,

	res = ovl_path_getxattr(ofs, upperpath, OVL_XATTR_UUID, uuid.b,

				UUID_SIZE);

	if (res == UUID_SIZE)

		return true;

		goto set_uuid;



	if (res != -ENODATA)

		goto fail;
@@ -794,17 +795,20 @@ bool ovl_init_uuid_xattr(struct super_block *sb, struct ovl_fs *ofs, 
	}



	/* Generate overlay instance uuid */

	uuid_gen(&sb->s_uuid);

	uuid_gen(&uuid);



	/* Try to store persistent uuid */

	set = true;

	res = ovl_setxattr(ofs, upperpath->dentry, OVL_XATTR_UUID, sb->s_uuid.b,

	res = ovl_setxattr(ofs, upperpath->dentry, OVL_XATTR_UUID, uuid.b,

			   UUID_SIZE);

	if (res == 0)

	if (res)

		goto fail;



set_uuid:

	super_set_uuid(sb, uuid.b, sizeof(uuid));

	return true;



fail:

	memset(sb->s_uuid.b, 0, UUID_SIZE);

	ofs->config.uuid = OVL_UUID_NULL;

	pr_warn("failed to %s uuid (%pd2, err=%i); falling back to uuid=null.\n",

		set ? "set" : "get", upperpath->dentry, res);