diff options
author | Ahmad Fatoum <a.fatoum@pengutronix.de> | 2020-03-05 08:40:32 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-03-09 08:36:15 +0100 |
commit | f41e5160c8618455064a4ff4227105010cd56aaa (patch) | |
tree | 0c1c2e4f9626b488a9ce970e6acd9304c4c314ca /common/state/state.c | |
parent | dc5100e6ba686fafd5570ce6d972383f047c7313 (diff) | |
download | barebox-f41e5160c8618455064a4ff4227105010cd56aaa.tar.gz barebox-f41e5160c8618455064a4ff4227105010cd56aaa.tar.xz |
state: treat state with all-invalid buckets as dirty
The state.dirty flag controls whether state_save will actually
persist state. It is cleared when we successfully load or save
state and set on writing a state parameter.
When the state however becomes corrupt during barebox runtime and
state.dirty == 0, reinitializing the state to defaults is quite
cumbersome:
1. We reset twice. After the first reset, the dirty flag is reset
and before the second, state_save will reinitialize to defaults
2. We write any state variable and then run the state -s command
Both workarounds are quite obscure, improve the user experience
by having state -l set the dirty flag when it fails, so a subsequent
state -s may persist the default values to state.
Steps to reproduce:
barebox$ state -l
state: Using bucket 0@0x00000000
barebox$ memcpy -s /dev/zero -d /dev/eeprom0.state 0 0 0x400
barebox$ state -s
barebox$ state -l
ERROR: state: No meta data header found
ERROR: state: No meta data header found
ERROR: state: No meta data header found
ERROR: state: Failed to find any valid state copy in any bucket
ERROR: state: Failed to read state with format raw, -2
state: No such file or directory
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'common/state/state.c')
-rw-r--r-- | common/state/state.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/common/state/state.c b/common/state/state.c index b168387eef..1822f37f3e 100644 --- a/common/state/state.c +++ b/common/state/state.c @@ -94,7 +94,7 @@ out: */ static int state_do_load(struct state *state, enum state_flags flags) { - void *buf; + void *buf = NULL; ssize_t len; int ret; @@ -103,7 +103,7 @@ static int state_do_load(struct state *state, enum state_flags flags) if (ret) { dev_err(&state->dev, "Failed to read state with format %s, %d\n", state->format->name, ret); - return ret; + goto out; } ret = state->format->unpack(state->format, state, buf, len); @@ -114,9 +114,8 @@ static int state_do_load(struct state *state, enum state_flags flags) } state->init_from_defaults = 0; - state->dirty = 0; - out: + state->dirty = !!ret; /* mark dirty on error */ free(buf); return ret; } |