From 13c37ad3f37a95d66cf66d3b3eaffa3ecacac106 Mon Sep 17 00:00:00 2001 From: Adam Kwolek Date: Wed, 8 Jun 2011 17:13:30 +1000 Subject: [PATCH] Do not use backup file for external metadata When external metatdata handler supports manage_reshape() and recover_backup() functions in super switch backup file is not required and can be omitted. For backup purposes metadata specific mechanisms are used. Signed-off-by: Adam Kwolek Signed-off-by: Krzysztof Wojcik Signed-off-by: NeilBrown --- Grow.c | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/Grow.c b/Grow.c index c2c45ae..7239d46 100644 --- a/Grow.c +++ b/Grow.c @@ -2039,25 +2039,29 @@ started: if (d < 0) { goto release; } - if (backup_file == NULL) { - if (reshape.after.data_disks <= reshape.before.data_disks) { - fprintf(stderr, - Name ": %s: Cannot grow - need backup-file\n", - devname); - goto release; - } else if (sra->array.spare_disks == 0) { - fprintf(stderr, Name ": %s: Cannot grow - need a spare or " - "backup-file to backup critical section\n", - devname); - goto release; + if ((st->ss->manage_reshape == NULL) || + (st->ss->recover_backup == NULL)) { + if (backup_file == NULL) { + if (reshape.after.data_disks <= + reshape.before.data_disks) { + fprintf(stderr, Name ": %s: Cannot grow - " + "need backup-file\n", devname); + goto release; + } else if (sra->array.spare_disks == 0) { + fprintf(stderr, Name ": %s: Cannot grow - " + "need a spare or backup-file to backup " + "critical section\n", devname); + goto release; + } + } else { + if (!reshape_open_backup_file(backup_file, fd, devname, + (signed)blocks, + fdlist+d, offsets+d, + restart)) { + goto release; + } + d++; } - } else { - if (!reshape_open_backup_file(backup_file, fd, devname, - (signed)blocks, - fdlist+d, offsets+d, restart)) { - goto release; - } - d++; } /* lastly, check that the internal stripe cache is