From f522aa5695dd08a3ad7553373322861a6e9b8050 Mon Sep 17 00:00:00 2001 From: bobijam Date: Thu, 12 Jun 2008 02:51:11 +0000 Subject: [PATCH] Branch HEAD b=15345 o=johann i=nathan, bobijam check --writeconf flag when forcing the index. --- lustre/mgs/mgs_llog.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lustre/mgs/mgs_llog.c b/lustre/mgs/mgs_llog.c index 49c7aac..497226e 100644 --- a/lustre/mgs/mgs_llog.c +++ b/lustre/mgs/mgs_llog.c @@ -520,10 +520,12 @@ int mgs_set_index(struct obd_device *obd, struct mgs_target_info *mti) } if (test_bit(mti->mti_stripe_index, imap)) { - if (mti->mti_flags & LDD_F_VIRGIN) { + if ((mti->mti_flags & LDD_F_VIRGIN) && + !(mti->mti_flags & LDD_F_WRITECONF)) { LCONSOLE_ERROR_MSG(0x140, "Server %s requested index " "%d, but that index is already in " - "use\n", mti->mti_svname, + "use. Use --writeconf to force\n", + mti->mti_svname, mti->mti_stripe_index); RETURN(-EADDRINUSE); } else { -- 1.8.3.1