Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

dm log: report fault status

Browse source 
This patch reports the status of the log device so that userspace can detect
the error and take appropriate action.

Signed-off-by: Jonathan E Brassow <jbrassow@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jonathan E Brassow 2007-05-09 02:32:58 -07:00 committed by Linus Torvalds
parent 01d03a660e
commit 315dcc226f
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/md/dm-log.c
View file

@ -615,6 +615,7 @@ static int core_status(struct dirty_log *log, status_type_t status,
switch(status) { switch(status) {
case STATUSTYPE_INFO: case STATUSTYPE_INFO:
DMEMIT("1 %s", log->type->name);
break; break;
case STATUSTYPE_TABLE: case STATUSTYPE_TABLE:
@ -630,17 +631,17 @@ static int disk_status(struct dirty_log *log, status_type_t status,
char *result, unsigned int maxlen) char *result, unsigned int maxlen)
{ {
int sz = 0; int sz = 0;
char buffer[16];
struct log_c *lc = log->context; struct log_c *lc = log->context;
switch(status) { switch(status) {
case STATUSTYPE_INFO: case STATUSTYPE_INFO:
DMEMIT("3 %s %s %c", log->type->name, lc->log_dev->name,
lc->log_dev_failed ? 'D' : 'A');
break; break;
case STATUSTYPE_TABLE: case STATUSTYPE_TABLE:
format_dev_t(buffer, lc->log_dev->bdev->bd_dev);
DMEMIT("%s %u %s %u ", log->type->name, DMEMIT("%s %u %s %u ", log->type->name,
lc->sync == DEFAULTSYNC ? 2 : 3, buffer, lc->sync == DEFAULTSYNC ? 2 : 3, lc->log_dev->name,
lc->region_size); lc->region_size);
DMEMIT_SYNC; DMEMIT_SYNC;
} }

11
drivers/md/dm-raid1.c
View file

@ -1205,11 +1205,9 @@ static void mirror_resume(struct dm_target *ti)
static int mirror_status(struct dm_target *ti, status_type_t type, static int mirror_status(struct dm_target *ti, status_type_t type,
char *result, unsigned int maxlen) char *result, unsigned int maxlen)
{ {
unsigned int m, sz; unsigned int m, sz = 0;
struct mirror_set *ms = (struct mirror_set *) ti->private; struct mirror_set *ms = (struct mirror_set *) ti->private;
sz = ms->rh.log->type->status(ms->rh.log, type, result, maxlen);
switch (type) { switch (type) {
case STATUSTYPE_INFO: case STATUSTYPE_INFO:
DMEMIT("%d ", ms->nr_mirrors); DMEMIT("%d ", ms->nr_mirrors);
@ -1220,9 +1218,14 @@ static int mirror_status(struct dm_target *ti, status_type_t type,
(unsigned long long)ms->rh.log->type-> (unsigned long long)ms->rh.log->type->
get_sync_count(ms->rh.log), get_sync_count(ms->rh.log),
(unsigned long long)ms->nr_regions); (unsigned long long)ms->nr_regions);
sz = ms->rh.log->type->status(ms->rh.log, type, result, maxlen);
break; break;
case STATUSTYPE_TABLE: case STATUSTYPE_TABLE:
sz = ms->rh.log->type->status(ms->rh.log, type, result, maxlen);
DMEMIT("%d", ms->nr_mirrors); DMEMIT("%d", ms->nr_mirrors);
for (m = 0; m < ms->nr_mirrors; m++) for (m = 0; m < ms->nr_mirrors; m++)
DMEMIT(" %s %llu", ms->mirror[m].dev->name, DMEMIT(" %s %llu", ms->mirror[m].dev->name,
@ -1234,7 +1237,7 @@ static int mirror_status(struct dm_target *ti, status_type_t type,
static struct target_type mirror_target = { static struct target_type mirror_target = {
.name = "mirror", .name = "mirror",
.version = {1, 0, 2}, .version = {1, 0, 3},
.module = THIS_MODULE, .module = THIS_MODULE,
.ctr = mirror_ctr, .ctr = mirror_ctr,
.dtr = mirror_dtr, .dtr = mirror_dtr,