Skip to content

[kernel]: Fix/blk gnu conditional extension #11212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Rbb666 merged 1 commit into from
Feb 22, 2026
+5 −2
Merged

[kernel]: Fix/blk gnu conditional extension #11212

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions components/drivers/block/blk.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,9 @@ static int list_blk(int argc, char**argv)
}

size_name = convert_size(&geome, geome.sector_count, &cap, &minor);
const char *mnt_path;

mnt_path = dfs_filesystem_get_mounted_path(&disk->parent);
rt_kprintf("%-*.s %3u.%-3u %u %u.%u%s\t%u disk %s\n",
RT_NAME_MAX, to_disk_name(disk),
#ifdef RT_USING_DM
Expand All @@ -546,12 +548,13 @@ static int list_blk(int argc, char**argv)
#endif
disk->removable, cap, minor, size_name, disk->read_only,
disk->max_partitions != RT_BLK_PARTITION_NONE ? "\b" :
(dfs_filesystem_get_mounted_path(&disk->parent) ? : "\b"));
(mnt_path ? mnt_path : "\b"));

rt_list_for_each_entry(blk_dev, &disk->part_nodes, list)
{
size_name = convert_size(&geome, blk_dev->sector_count, &cap, &minor);

mnt_path = dfs_filesystem_get_mounted_path(&blk_dev->parent);
rt_kprintf("%c--%-*.s %3u.%-3u %u %u.%u%s\t%u part %s\n",
blk_dev->list.next != &disk->part_nodes ? '|' : '`',
RT_NAME_MAX - 3, to_blk_name(blk_dev),
Expand All @@ -561,7 +564,7 @@ static int list_blk(int argc, char**argv)
0, 0,
#endif
disk->removable, cap, minor, size_name, disk->read_only,
dfs_filesystem_get_mounted_path(&blk_dev->parent) ? : "");
mnt_path ? mnt_path : "");
}
}

Expand Down