Whamcloud - gitweb
branch HEAD
authorzhanghc <zhanghc>
Tue, 11 Nov 2008 03:47:05 +0000 (03:47 +0000)
committerzhanghc <zhanghc>
Tue, 11 Nov 2008 03:47:05 +0000 (03:47 +0000)
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

lustre/osc/osc_create.c

index b022304..b34341b 100644 (file)
@@ -283,6 +283,9 @@ int osc_precreate(struct obd_export *exp)
         if (imp != NULL && imp->imp_deactive)
                 RETURN(1000);
 
+        if (oscc_recovering(oscc))
+                RETURN(2);
+
         if (oscc->oscc_last_id < oscc->oscc_next_id) {
                 spin_lock(&oscc->oscc_lock);
                 if (oscc->oscc_flags & OSCC_FLAG_NOSPC) {
@@ -293,11 +296,6 @@ int osc_precreate(struct obd_export *exp)
                         spin_unlock(&oscc->oscc_lock);
                         RETURN(1);
                 }
-                if (oscc->oscc_flags & OSCC_FLAG_RECOVERING) {
-                        spin_unlock(&oscc->oscc_lock);
-                        RETURN(2);
-                }
-
                 if (oscc->oscc_flags & OSCC_FLAG_CREATING) {
                         spin_unlock(&oscc->oscc_lock);
                         RETURN(1);