diff options
| author | Mark Brown <broonie@kernel.org> | 2026-07-06 13:00:34 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-07-06 13:00:34 +0100 |
| commit | 688c48b5cd5b57b0911852a1fc3c2426d3d7f887 (patch) | |
| tree | 20c72825d61e8bcc8f472dfbfedd72c4f7c1ec82 | |
| parent | d3ad79f2e9d5d0bb4d20b2cc34586ff8b0ea514e (diff) | |
| parent | 1006b2f57f77325bfbf5bd36685efe60334fa360 (diff) | |
| download | linux-next-688c48b5cd5b57b0911852a1fc3c2426d3d7f887.tar.gz linux-next-688c48b5cd5b57b0911852a1fc3c2426d3d7f887.zip | |
Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git
| -rw-r--r-- | fs/erofs/super.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/fs/erofs/super.c b/fs/erofs/super.c index 86fa5c6a0c70..c5881bb8d52b 100644 --- a/fs/erofs/super.c +++ b/fs/erofs/super.c @@ -595,17 +595,6 @@ static const struct export_operations erofs_export_ops = { .get_parent = erofs_get_parent, }; -static void erofs_set_sysfs_name(struct super_block *sb) -{ - struct erofs_sb_info *sbi = EROFS_SB(sb); - - if (erofs_is_fileio_mode(sbi)) - super_set_sysfs_name_generic(sb, "%s", - bdi_dev_name(sb->s_bdi)); - else - super_set_sysfs_name_id(sb); -} - static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc) { struct inode *inode; @@ -657,12 +646,14 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc) err = super_setup_bdi(sb); if (err) return err; + + snprintf(sb->s_id, sizeof(sb->s_id), + "%u:%u", MAJOR(sb->s_dev), MINOR(sb->s_dev)); } else { if (!sb_set_blocksize(sb, PAGE_SIZE)) { errorfc(fc, "failed to set initial blksize"); return -EINVAL; } - sbi->dif0.dax_dev = fs_dax_get_by_bdev(sb->s_bdev, &sbi->dif0.dax_part_off, NULL, NULL); } @@ -740,7 +731,7 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc) if (err) return err; - erofs_set_sysfs_name(sb); + super_set_sysfs_name_id(sb); err = erofs_register_sysfs(sb); if (err) return err; |