Skip to content
Snippets Groups Projects
Commit a688bd37 authored by Hongchao Zhang's avatar Hongchao Zhang
Browse files

branch HEAD

b=17495

move the check of recovering state of the OST in osc_precreate
out of "if (oscc->oscc_last_id < oscc->oscc_next_id)" condition
so create operation don't use recovering OST

i=adilger
i=nathan.rutman
parent 9ab07c28
No related branches found
No related tags found
No related merge requests found
...@@ -283,6 +283,9 @@ int osc_precreate(struct obd_export *exp) ...@@ -283,6 +283,9 @@ int osc_precreate(struct obd_export *exp)
if (imp != NULL && imp->imp_deactive) if (imp != NULL && imp->imp_deactive)
RETURN(1000); RETURN(1000);
if (oscc_recovering(oscc))
RETURN(2);
if (oscc->oscc_last_id < oscc->oscc_next_id) { if (oscc->oscc_last_id < oscc->oscc_next_id) {
spin_lock(&oscc->oscc_lock); spin_lock(&oscc->oscc_lock);
if (oscc->oscc_flags & OSCC_FLAG_NOSPC) { if (oscc->oscc_flags & OSCC_FLAG_NOSPC) {
...@@ -293,11 +296,6 @@ int osc_precreate(struct obd_export *exp) ...@@ -293,11 +296,6 @@ int osc_precreate(struct obd_export *exp)
spin_unlock(&oscc->oscc_lock); spin_unlock(&oscc->oscc_lock);
RETURN(1); RETURN(1);
} }
if (oscc->oscc_flags & OSCC_FLAG_RECOVERING) {
spin_unlock(&oscc->oscc_lock);
RETURN(2);
}
if (oscc->oscc_flags & OSCC_FLAG_CREATING) { if (oscc->oscc_flags & OSCC_FLAG_CREATING) {
spin_unlock(&oscc->oscc_lock); spin_unlock(&oscc->oscc_lock);
RETURN(1); RETURN(1);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment