RepoMirrors
/
mars
mirror of https://github.com/schoebel/mars
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

if: set capacity upon regular switch() maintenance

This commit is contained in:
Thomas Schoebel-Theuer 2013-09-24 09:53:54 +02:00 committed by Thomas Schoebel-Theuer
parent 7f8bf6c29a
commit 8971edad18
2 changed files with 32 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
kernel/mars_if.c
View File

@ -687,6 +687,17 @@ static int if_switch(struct if_brick *brick)
down(&brick->switch_sem);
// brick is in operation
if (brick->power.button && brick->power.led_on) {
capacity = compute_capacity(brick);
if (capacity > 0 && capacity != input->capacity) {
MARS_INF("changing capacity from %lld to %lld\n", (long long)input->capacity * 2, (long long)capacity * 2);
input->capacity = capacity;
set_capacity(input->disk, capacity);
}
}
// brick should be switched on
if (brick->power.button && brick->power.led_off) {
mars_power_led_off((void*)brick, false);
brick->say_channel = get_binding(current);
@ -795,12 +806,14 @@ static int if_switch(struct if_brick *brick)
#else
set_device_ro(input->bdev, 0); // TODO: implement modes
#endif
status = 0;
}
if (brick->power.button) {
// report success
mars_power_led_on((void*)brick, true);
status = 0;
} else if (!brick->power.led_off) {
}
// brick should be switched off
if (!brick->power.button && !brick->power.led_off) {
int flying;
mars_power_led_on((void*)brick, false);
@ -922,15 +935,6 @@ char *if_statistics(struct if_brick *brick, int verbose)
int tmp3 = atomic_read(&input->total_write_count);
int tmp4 = atomic_read(&input->total_mref_write_count);
#if 1 // HACK!
unsigned long capacity;
capacity = compute_capacity(brick);
if (capacity > 0 && capacity != input->capacity) {
MARS_INF("changing capacity from %lld to %lld\n", (long long)input->capacity * 2, (long long)capacity * 2);
input->capacity = capacity;
set_capacity(input->disk, capacity);
}
#endif
if (!res)
return NULL;
snprintf(res, 512,

20
kernel/sy_old/sy_generic.c
View File

@ -476,15 +476,25 @@ int mars_power_button(struct mars_brick *brick, bool val, bool force_off)
MARS_DBG("brick '%s' '%s' type '%s' power button %d -> %d\n", brick->brick_name, brick->brick_path, brick->type->type_name, oldval, val);
set_button(&brick->power, val, false);
}
if (likely(brick->ops)) {
status = brick->ops->brick_switch(brick);
} else {
MARS_ERR("brick '%s' '%s' has no brick_switch() method\n", brick->brick_name, brick->brick_path);
}
if (unlikely(!brick->ops)) {
MARS_ERR("brick '%s' '%s' has no brick_switch() method\n", brick->brick_name, brick->brick_path);
status = -EINVAL;
goto done;
}
/* Always call the switch function, even if nothing changes.
* The implementations must be idempotent.
* They may exploit the regular calls for some maintenance operations
* (e.g. changing disk capacity etc).
*/
status = brick->ops->brick_switch(brick);
if (val != oldval) {
mars_trigger();
}
done:
return status;
}