diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-03-11 19:02:06 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-03-11 19:02:06 +0100 |
| commit | 0f1a876682f0979d6a1e5f86861dd562d1758936 (patch) | |
| tree | 8f366cddf7bf5544d0af8266e99ff1718f977a28 /fs/ext4 | |
| parent | Merge tag 'vfs-6.9.super' of git://git.kernel.org/pub/scm/linux/kernel/git/vf... (diff) | |
| parent | Merge series "filesystem visibility ioctls" of https://lore.kernel.org/r/2024... (diff) | |
| download | linux-0f1a876682f0979d6a1e5f86861dd562d1758936.tar.xz linux-0f1a876682f0979d6a1e5f86861dd562d1758936.zip | |
Merge tag 'vfs-6.9.uuid' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs
Pull vfs uuid updates from Christian Brauner:
"This adds two new ioctl()s for getting the filesystem uuid and
retrieving the sysfs path based on the path of a mounted filesystem.
Getting the filesystem uuid has been implemented in filesystem
specific code for a while it's now lifted as a generic ioctl"
* tag 'vfs-6.9.uuid' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs:
xfs: add support for FS_IOC_GETFSSYSFSPATH
fs: add FS_IOC_GETFSSYSFSPATH
fat: Hook up sb->s_uuid
fs: FS_IOC_GETUUID
ovl: convert to super_set_uuid()
fs: super_set_uuid()
Diffstat (limited to 'fs/ext4')
| -rw-r--r-- | fs/ext4/super.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 0509ef441271..a8ba84eabab2 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -5346,7 +5346,7 @@ static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb) 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)); + super_set_uuid(sb, es->s_uuid, sizeof(es->s_uuid)); INIT_LIST_HEAD(&sbi->s_orphan); /* unlinked but open files */ mutex_init(&sbi->s_orphan_lock); |