reiser4progs: fsck: Handle "unprepped" ctail items
PATCH 1/6 reiser4progs: fsck: Handle "unprepped" ctail items
. Handle orphan "unprepped" clusters;
. Don't repair the value of cluster shift in ctail item
in all circumstances. If cluster shift is wrong, then remove the whole cluster.
Signed-off-by Edward Shishkin <[email protected]>
--- plugin/object/ccreg40/ccreg40.c | 12 +- plugin/object/ccreg40/ccreg40.h | 9 + plugin/object/ccreg40/ccreg40_repair.c | 196 +++++++++++++++++---------------- 3 files changed, 121 insertions(+), 96 deletions(-)
plugin/object/ccreg40/ccreg40.h +8 -1
@@ -11,6 +11,12 @@#include "reiser4/plugin.h" #include "plugin/object/obj40/obj40.h" +#define MIN_VALID_CLUSTER_SHIFT (0xc) +#define MAX_VALID_CLUSTER_SHIFT (0x10) +#define UNPREPPED_CLUSTER_SHIFT (0xff) + +#define ccreg40_cloff (off, size) ((off) & ((size) - 1)) +#define ccreg40_clstart (off, size) ((off) & ~((size) - 1))#define ccreg40_clnext (off, size) (ccreg40_clstart(off, size) + (size))
@@ -22,7 +28,8 @@ extern errno_t ccreg40_check_struct(reisplace_func_t func, void *data, uint8_t mode); -extern uint32_t ccreg40_get_cluster_size (reiser4_place_t *place); +extern errno_t ccreg40_get_cluster_shift (reiser4_place_t *place, +uint8_t *shift);extern errno_t ccreg40_set_cluster_size (reiser4_place_t *place,uint32_t cluster);
plugin/object/ccreg40/ccreg40_repair.c +106 -90
296 lines not on this page · raw message
plugin/object/ccreg40/ccreg40.c +7 -5
@@ -8,7 +8,7 @@#include "ccreg40.h" #include "plugin/object/obj40/obj40_repair.h" -uint32_t ccreg40_get_cluster_size (reiser4_place_t *place) { +errno_t ccreg40_get_cluster_shift (reiser4_place_t *place,uint8_t *shift) {trans_hint_t hint;ctail_hint_t chint;
@@ -17,10 +17,12 @@ uint32_t ccreg40_get_cluster_size(reiser hint.specific = &chint; hint.count =1 ; -if (objcall (place, object->fetch_units, &hint) !=1 ) -return MAX_UINT32 ; - -return 1 << chint.shift; +if (objcall (place, object->fetch_units, &hint) !=1 ) { +aal_error ("Can not extract cluster shift." ); +return -EINVAL ; + } + *shift = chint.shift; +return 0 ; }errno_t ccreg40_set_cluster_size (reiser4_place_t *place,uint32_t cluster) {