rt/snapraid
1
0
Fork 0
mirror of https://github.com/amadvance/snapraid.git synced 2026-10-26 19:01:57 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Prints also the disk name when listing devices.

Browse source
This commit is contained in:
Andrea Mazzoleni 2015-01-10 10:21:26 +01:00
parent bd475e5314
commit 9517e0c622
3 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
cmdline/portable.h
View file

@ -306,6 +306,7 @@ int randomize(void* ptr, size_t size);
* Disk entry.
*/
struct disk_struct {
char name[PATH_MAX]; /**< Name of the disk. */
char path[PATH_MAX]; /**< Mount point or contained directory. */
uint64_t device; /**< Device ID. */
#if HAVE_PTHREAD_CREATE

2
cmdline/spin.c
View file

@ -40,6 +40,7 @@ void state_spin(struct snapraid_state* state, int operation)
entry = malloc_nofail(sizeof(disk_t));
pathcpy(entry->name, sizeof(entry->name), disk->name);
pathprint(entry->path, sizeof(entry->path), "%s", disk->dir);
entry->device = disk->device;
@ -52,6 +53,7 @@ void state_spin(struct snapraid_state* state, int operation)
entry = malloc_nofail(sizeof(disk_t));
pathcpy(entry->name, sizeof(entry->name), lev_config_name(j));
pathprint(entry->path, sizeof(entry->path), "%s", state->parity[j].path);
pathcut(entry->path); /* remove the parity file */
entry->device = state->parity[j].device;

11
cmdline/unix.c
View file

@ -403,7 +403,7 @@ static dev_t devread(const char* path)
* Read a device tree filling the specified list of disk_t entries.
*/
#if HAVE_LINUX_DEVICE
static int devtree(dev_t device, tommy_list* list)
static int devtree(const char* name, dev_t device, tommy_list* list)
{
char path[PATH_MAX];
DIR* d;
@ -428,7 +428,7 @@ static int devtree(dev_t device, tommy_list* list)
/* LCOV_EXCL_STOP */
}
if (devtree(device, list) != 0) {
if (devtree(name, device, list) != 0) {
/* LCOV_EXCL_START */
return -1;
/* LCOV_EXCL_STOP */
@ -491,6 +491,7 @@ static int devtree(dev_t device, tommy_list* list)
disk = malloc_nofail(sizeof(disk_t));
pathcpy(disk->name, sizeof(disk->name), name);
pathprint(disk->path, sizeof(disk->path), "/dev/%s", buf + 3);
disk->device = device;
@ -653,7 +654,7 @@ static int spin_devices(tommy_list* list)
tommy_list_init(&tree);
/* expand the tree of devices */
if (devtree(disk->device, &tree) != 0) {
if (devtree(disk->name, disk->device, &tree) != 0) {
/* LCOV_EXCL_START */
tommy_list_foreach(&tree, free);
fprintf(stderr, "Failed to expand device '%u:%u'.\n", major(disk->device), minor(disk->device));
@ -663,7 +664,7 @@ static int spin_devices(tommy_list* list)
for (j = tommy_list_head(&tree); j != 0; j = j->next) {
disk_t* entry = j->data;
printf("%u:%u\t%s\t%u:%u\t%s\n", major(entry->device), minor(entry->device), entry->path, major(disk->device), minor(disk->device), disk->path);
printf("%u:%u\t%s\t%u:%u\t%s\t%s\n", major(entry->device), minor(entry->device), entry->path, major(disk->device), minor(disk->device), disk->name, disk->path);
}
tommy_list_foreach(&tree, free);
@ -758,7 +759,7 @@ int diskspin(tommy_list* list, int operation)
disk_t* disk = i->data;
/* expand the tree of devices */
if (devtree(disk->device, &tree) != 0) {
if (devtree(disk->name, disk->device, &tree) != 0) {
/* LCOV_EXCL_START */
tommy_list_foreach(&tree, free);
fprintf(stderr, "Failed to expand device '%u:%u'.\n", major(disk->device), minor(disk->device));