38 lines
1.4 KiB
Diff
38 lines
1.4 KiB
Diff
From a57150fe53c1e85babe43129d047b502b0316765 Mon Sep 17 00:00:00 2001
|
|
From: Kent Overstreet <kent.overstreet@linux.dev>
|
|
Date: Tue, 9 Jul 2024 09:11:33 +0800
|
|
Subject: [PATCH 069/233] bcachefs: Add support for FS_IOC_GETFSUUID
|
|
Content-Type: text/plain; charset="utf-8"
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Use super_set_uuid() to set `sb->s_uuid_len` to avoid returning `-ENOTTY`
|
|
with sb->s_uuid_len being 0.
|
|
|
|
Original patch link:
|
|
[1]: https://lore.kernel.org/all/20240207025624.1019754-2-kent.overstreet@linux.dev/
|
|
|
|
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
|
|
Signed-off-by: Youling Tang <tangyouling@kylinos.cn>
|
|
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
|
|
Signed-off-by: Alexander Miroshnichenko <alex@millerson.name>
|
|
---
|
|
fs/bcachefs/fs.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/fs/bcachefs/fs.c b/fs/bcachefs/fs.c
|
|
index 91fce04272a1..396a8f677621 100644
|
|
--- a/fs/bcachefs/fs.c
|
|
+++ b/fs/bcachefs/fs.c
|
|
@@ -2216,7 +2216,7 @@ static int bch2_fs_get_tree(struct fs_context *fc)
|
|
sb->s_time_gran = c->sb.nsec_per_time_unit;
|
|
sb->s_time_min = div_s64(S64_MIN, c->sb.time_units_per_sec) + 1;
|
|
sb->s_time_max = div_s64(S64_MAX, c->sb.time_units_per_sec);
|
|
- sb->s_uuid = c->sb.user_uuid;
|
|
+ super_set_uuid(sb, c->sb.user_uuid.b, sizeof(c->sb.user_uuid));
|
|
sb->s_shrink->seeks = 0;
|
|
c->vfs_sb = sb;
|
|
strscpy(sb->s_id, c->name, sizeof(sb->s_id));
|
|
--
|
|
2.45.2
|
|
|