Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
b=21563 Correcting the patch
[fs/lustre-release.git]
/
lustre
/
osc
/
osc_create.c
diff --git
a/lustre/osc/osc_create.c
b/lustre/osc/osc_create.c
index
5fd149b
..
93e5a67
100644
(file)
--- 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);
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);
}
cfs_spin_unlock(&oscc->oscc_lock);
RETURN(0);
}
@@
-361,8
+361,8
@@
int osc_precreate(struct obd_export *exp)
RETURN(1000);
}
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);
}
cfs_spin_unlock(&oscc->oscc_lock);
RETURN(2);
}