bcachefs: Add support for FS_IOC_GETFSUUID
PATCH 1/2 bcachefs: Add support for FS_IOC_GETFSUUID
From: Kent Overstreet <[email protected]>
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/[email protected]/
--- fs/bcachefs/fs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/bcachefs/fs.c +1 -1
@@ -1977,7 +1977,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));
Signature · 1 line
2.34.1
PATCH 2/2 bcachefs: Add support for FS_IOC_GETFSSYSFSPATH
From: Kent Overstreet <[email protected]>
[TEST]:
```
$ cat ioctl_getsysfspath.c
#include <stdio.h>
#include <stdlib.h>
#include <fcntl.h>
#include <sys/ioctl.h>
#include <linux/fs.h>
#include <unistd.h>
int main(int argc, char *argv[]) {
int fd;
struct fs_sysfs_path sysfs_path = {};
if (argc != 2) {
fprintf(stderr, "Usage: %s <path_to_file_or_directory>\n", argv[0]);
exit(EXIT_FAILURE);
}
fd = open(argv[1], O_RDONLY);
if (fd == -1) {
perror("open");
exit(EXIT_FAILURE);
}
if (ioctl(fd, FS_IOC_GETFSSYSFSPATH, &sysfs_path) == -1) {
perror("ioctl FS_IOC_GETFSSYSFSPATH");
close(fd);
exit(EXIT_FAILURE);
}
printf("FS_IOC_GETFSSYSFSPATH: %s\n", sysfs_path.name);
close(fd);
return 0;
}
$ gcc ioctl_getsysfspath.c
$ sudo bcachefs format /dev/sda
$ sudo mount.bcachefs /dev/sda /mnt
$ sudo ./a.out /mnt
FS_IOC_GETFSSYSFSPATH: bcachefs/c380b4ab-fbb6-41d2-b805-7a89cae9cadb
```Original patch link:
[1]: https://lore.kernel.org/all/[email protected]/
--- fs/bcachefs/fs.c | 1 + 1 file changed, 1 insertion(+)
fs/bcachefs/fs.c +1 -0
@@ -1978,6 +1978,7 @@ static int bch2_fs_get_tree(struct fs_context *fc) 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);super_set_uuid (sb, c->sb.user_uuid.b,sizeof (c->sb.user_uuid)); +super_set_sysfs_name_uuid (sb); sb->s_shrink->seeks =0 ; c->vfs_sb = sb;strscpy (sb->s_id, c->name,sizeof (sb->s_id));
Signature · 1 line
2.34.1
Re: [PATCH 2/2] bcachefs: Add support for FS_IOC_GETFSSYSFSPATH
Quoted 59 lines · Youling Tang
From: Kent Overstreet <[email protected]>
[TEST]:
``` $ cat ioctl_getsysfspath.c #include <stdio.h> #include <stdlib.h> #include <fcntl.h> #include <sys/ioctl.h> #include <linux/fs.h> #include <unistd.h> int main(int argc, char *argv[]) { int fd; struct fs_sysfs_path sysfs_path = {}; if (argc != 2) { fprintf(stderr, "Usage: %s <path_to_file_or_directory>\n", argv[0]); exit(EXIT_FAILURE); } fd = open(argv[1], O_RDONLY); if (fd == -1) { perror("open"); exit(EXIT_FAILURE); } if (ioctl(fd, FS_IOC_GETFSSYSFSPATH, &sysfs_path) == -1) { perror("ioctl FS_IOC_GETFSSYSFSPATH"); close(fd); exit(EXIT_FAILURE); } printf("FS_IOC_GETFSSYSFSPATH: %s\n", sysfs_path.name); close(fd); return 0; } $ gcc ioctl_getsysfspath.c $ sudo bcachefs format /dev/sda $ sudo mount.bcachefs /dev/sda /mnt $ sudo ./a.out /mnt FS_IOC_GETFSSYSFSPATH: bcachefs/c380b4ab-fbb6-41d2-b805-7a89cae9cadb ```Original patch link:
[1]: https://lore.kernel.org/all/[email protected]/Signed-off-by Kent Overstreet <[email protected]>Signed-off-by Youling Tang <[email protected]>--- fs/bcachefs/fs.c | 1 + 1 file changed, 1 insertion(+)fs/bcachefs/fs.c +0
-0
fs/bcachefs/fs.c static int bch2_fs_get_tree(struct fs_context *fc) · line 1981
Quoted 4 lines
fs/bcachefs/fs.c +1
-0@@ -1978,6 +1978,7 @@ static int bch2_fs_get_tree(struct fs_context *fc) 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);super_set_uuid (sb, c->sb.user_uuid.b,sizeof (c->sb.user_uuid)); +super_set_sysfs_name_uuid (sb);
It's quite strange that other commits have been merged, but the ones for bcachefs have not been merged.
Thanks,
Hongbo
Quoted 3 lines
fs/bcachefs/fs.c +0
-0sb->s_shrink->seeks =0 ; c->vfs_sb = sb;strscpy (sb->s_id, c->name,sizeof (sb->s_id));
Re: [PATCH 2/2] bcachefs: Add support for FS_IOC_GETFSSYSFSPATH
Quoted 69 lines · Hongbo Li
Quoted 59 lines · Youling Tang
From: Kent Overstreet <[email protected]>
[TEST]:
``` $ cat ioctl_getsysfspath.c #include <stdio.h> #include <stdlib.h> #include <fcntl.h> #include <sys/ioctl.h> #include <linux/fs.h> #include <unistd.h> int main(int argc, char *argv[]) { int fd; struct fs_sysfs_path sysfs_path = {}; if (argc != 2) { fprintf(stderr, "Usage: %s <path_to_file_or_directory>\n", argv[0]); exit(EXIT_FAILURE); } fd = open(argv[1], O_RDONLY); if (fd == -1) { perror("open"); exit(EXIT_FAILURE); } if (ioctl(fd, FS_IOC_GETFSSYSFSPATH, &sysfs_path) == -1) { perror("ioctl FS_IOC_GETFSSYSFSPATH"); close(fd); exit(EXIT_FAILURE); } printf("FS_IOC_GETFSSYSFSPATH: %s\n", sysfs_path.name); close(fd); return 0; } $ gcc ioctl_getsysfspath.c $ sudo bcachefs format /dev/sda $ sudo mount.bcachefs /dev/sda /mnt $ sudo ./a.out /mnt FS_IOC_GETFSSYSFSPATH: bcachefs/c380b4ab-fbb6-41d2-b805-7a89cae9cadb ```Original patch link:
[1]: https://lore.kernel.org/all/[email protected]/Signed-off-by Kent Overstreet <[email protected]>Signed-off-by Youling Tang <[email protected]>---
fs/bcachefs/fs.c| 1 +1 file changed, 1 insertion(+)fs/bcachefs/fs.c +0
-0fs/bcachefs/fs.c static int bch2_fs_get_tree(struct fs_context *fc) · line 1981
Quoted 4 lines
fs/bcachefs/fs.c +1
-0@@ -1978,6 +1978,7 @@ static int bch2_fs_get_tree(struct fs_context *fc) 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); super_set_uuid(sb, c->sb.user_uuid.b, sizeof(c->sb.user_uuid)); + super_set_sysfs_name_uuid(sb);Reviewed-by Hongbo Li <[email protected]>
Quoted 1 line
It's quite strange that other commits have been merged, but the ones for bcachefs have not been merged.
Because bcachefs was not upstream at the time, [1] described the following:
Note, I dropped the bcachefs changes because they're not upstream yet. But once this is a stable branch you can just pull in vfs.uuid and rely on that.
[1]: https://lore.kernel.org/all/20240208-wecken-nutzen-3df1102a39b2@brauner/
Thanks,
Youling.
Re: [PATCH 2/2] bcachefs: Add support for FS_IOC_GETFSSYSFSPATH
Quoted 70 lines · Youling Tang
Quoted 69 lines · Hongbo Li
Quoted 59 lines · Youling Tang
From: Kent Overstreet <[email protected]>
[TEST]:
``` $ cat ioctl_getsysfspath.c #include <stdio.h> #include <stdlib.h> #include <fcntl.h> #include <sys/ioctl.h> #include <linux/fs.h> #include <unistd.h> int main(int argc, char *argv[]) { int fd; struct fs_sysfs_path sysfs_path = {}; if (argc != 2) { fprintf(stderr, "Usage: %s <path_to_file_or_directory>\n", argv[0]); exit(EXIT_FAILURE); } fd = open(argv[1], O_RDONLY); if (fd == -1) { perror("open"); exit(EXIT_FAILURE); } if (ioctl(fd, FS_IOC_GETFSSYSFSPATH, &sysfs_path) == -1) { perror("ioctl FS_IOC_GETFSSYSFSPATH"); close(fd); exit(EXIT_FAILURE); } printf("FS_IOC_GETFSSYSFSPATH: %s\n", sysfs_path.name); close(fd); return 0; } $ gcc ioctl_getsysfspath.c $ sudo bcachefs format /dev/sda $ sudo mount.bcachefs /dev/sda /mnt $ sudo ./a.out /mnt FS_IOC_GETFSSYSFSPATH: bcachefs/c380b4ab-fbb6-41d2-b805-7a89cae9cadb ```Original patch link:
[1]: https://lore.kernel.org/all/[email protected]/Signed-off-by Kent Overstreet <[email protected]>Signed-off-by Youling Tang <[email protected]>---
fs/bcachefs/fs.c| 1 +1 file changed, 1 insertion(+)fs/bcachefs/fs.c +0
-0fs/bcachefs/fs.c static int bch2_fs_get_tree(struct fs_context *fc) · line 1981
Quoted 4 lines
fs/bcachefs/fs.c +1
-0@@ -1978,6 +1978,7 @@ static int bch2_fs_get_tree(struct fs_context *fc) 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); super_set_uuid(sb, c->sb.user_uuid.b, sizeof(c->sb.user_uuid)); + super_set_sysfs_name_uuid(sb);Reviewed-by Hongbo Li <[email protected]>
Quoted 6 lines
Quoted 1 line
It's quite strange that other commits have been merged, but the ones for bcachefs have not been merged.
Because bcachefs was not upstream at the time, [1] described the following:
Note, I dropped the bcachefs changes because they're not upstream yet. But once this is a stable branch you can just pull in vfs.uuid and rely on that.
Got it! Thank you!
Thanks,
Hongbo
Quoted 4 lines
[1]: https://lore.kernel.org/all/20240208-wecken-nutzen-3df1102a39b2@brauner/
Thanks,
Youling.