From 16f000bcb4c6e4a4e6d4d9803c1268d43c92b480 Mon Sep 17 00:00:00 2001 From: Zdenek Kabelac Date: Thu, 3 Feb 2011 01:41:03 +0000 Subject: [PATCH] Fix wipe size when seting up mda. --- WHATS_NEW | 1 + lib/format_text/format-text.c | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 129cc9076..1dd5521cf 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.83 - =================================== + Fix wipe size when setting up mda. Remove unneeded checks for open_count in lv_info(). Synchronize with udev before checking open_count in lv_info(). Allow CLVMD_CMD_SYNC_NAMES to be propagated around the cluster if requested. diff --git a/lib/format_text/format-text.c b/lib/format_text/format-text.c index c186757ee..dadaed350 100644 --- a/lib/format_text/format-text.c +++ b/lib/format_text/format-text.c @@ -1347,8 +1347,8 @@ static int _mda_setup(const struct format_type *fmt, return 0; if (!dev_set((struct device *) pv->dev, start1, - (size_t) (mda_size1 > - wipe_size ? : mda_size1), 0)) { + (size_t) ((mda_size1 > wipe_size) ? + wipe_size : mda_size1), 0)) { log_error("Failed to wipe new metadata area"); return 0; } @@ -1392,8 +1392,8 @@ static int _mda_setup(const struct format_type *fmt, if (!add_mda(fmt, fmt->cmd->mem, mdas, pv->dev, start2, mda_size2, metadataignore)) return 0; if (!dev_set(pv->dev, start2, - (size_t) (mda_size1 > - wipe_size ? : mda_size1), 0)) { + (size_t) ((mda_size2 > wipe_size) ? + wipe_size : mda_size2), 0)) { log_error("Failed to wipe new metadata area"); return 0; } -- 2.43.5