Merge tag 'vfs-6.9.uuid' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs

[sfrench/cifs-2.6.git] / fs / overlayfs / util.c

diff --git a/fs/overlayfs/util.c b/fs/overlayfs/util.c
index a8e17f14d7a219aafada9e174ef50c6f67f56ff7..d285d1d7baaddedf6fc938ac8aaf8dc35e74d7d7 100644 (file)
--- a/fs/overlayfs/util.c
+++ b/fs/overlayfs/util.c
@@ -774,13 +774,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;
@@ -808,17 +809,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)
-               return true;
+       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);