From fb5301464770d6e5cde291ef3e97eef68b9e6768 Mon Sep 17 00:00:00 2001 From: Dmitry Zogin Date: Thu, 10 Jun 2010 01:58:17 -0400 Subject: [PATCH] b=21563 Correcting the patch --- lustre/osc/osc_create.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lustre/osc/osc_create.c b/lustre/osc/osc_create.c index 5fd149b..93e5a67 100644 --- a/lustre/osc/osc_create.c +++ b/lustre/osc/osc_create.c @@ -196,8 +196,8 @@ static int oscc_internal_create(struct osc_creator *oscc) LASSERT_SPIN_LOCKED(&oscc->oscc_lock); - if ((oscc->oscc_flags & OSCC_FLAG_RECOVERING) || - (oscc->oscc_flags & OSCC_FLAG_DEGRADED)) { + /* Do not check for a degraded OST here - bug21563/bug18539 */ + if (oscc->oscc_flags & OSCC_FLAG_RECOVERING) { cfs_spin_unlock(&oscc->oscc_lock); RETURN(0); } @@ -361,8 +361,8 @@ int osc_precreate(struct obd_export *exp) RETURN(1000); } - /* Do not check for a degraded OST here - bug21563/bug18539 */ - if (oscc->oscc_flags & OSCC_FLAG_RECOVERING) { + if ((oscc->oscc_flags & OSCC_FLAG_RECOVERING) || + (oscc->oscc_flags & OSCC_FLAG_DEGRADED)) { cfs_spin_unlock(&oscc->oscc_lock); RETURN(2); } -- 1.8.3.1