[Pvfs2-cvs] commit by slang in pvfs2/src/io/job: job-time-mgr.c

[CVS commit program]

Update of /projects/cvsroot/pvfs2/src/io/job
In directory parlweb1:/tmp/cvs-serv28668/src/io/job

Modified Files:
      Tag: kunkel-branch
	job-time-mgr.c 
Log Message:
reverse merge from trunk.  working for now.


Index: job-time-mgr.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/job/job-time-mgr.c,v
diff -p -u -r1.17.12.2 -r1.17.12.3
--- job-time-mgr.c	24 Jul 2006 17:20:45 -0000	1.17.12.2
+++ job-time-mgr.c	18 Aug 2006 05:12:09 -0000	1.17.12.3
@@ -118,8 +118,8 @@ static int __job_time_mgr_add(struct job
             break;
         }
 
-        tmp_bucket = NULL;
         prev_bucket = tmp_bucket;
+        tmp_bucket = NULL;
     }
 
     if(!tmp_bucket || tmp_bucket->expire_time_sec != expire_time_sec)
@@ -257,6 +257,7 @@ int job_time_mgr_expire(void)
 	    case JOB_BMI:
 		gossip_err("Job time out: cancelling bmi operation, job_id: %llu.\n", llu(jd->job_id));
 		ret = job_bmi_cancel(jd->job_id, jd->context_id);
+	        jd->time_bucket = NULL;
 		break;
 	    case JOB_FLOW:
 		/* have we made any progress since last time we checked? */
@@ -274,22 +275,23 @@ int job_time_mgr_expire(void)
 		    /* otherwise kill the flow */
 		    gossip_err("Job time out: cancelling flow operation, job_id: %llu.\n", llu(jd->job_id));
 		    ret = job_flow_cancel(jd->job_id, jd->context_id);
+	            jd->time_bucket = NULL;
 		}
 		break;
 	    case JOB_TROVE:
 		gossip_err("Job time out: cancelling trove operation, job_id: %llu.\n", llu(jd->job_id));
 		ret = job_trove_dspace_cancel(
                     jd->u.trove.fsid, jd->job_id, jd->context_id);
+	        jd->time_bucket = NULL;
                 break;
 	    default:
 		ret = 0;
+	        jd->time_bucket = NULL;
 		break;
 	    }
 
 	    /* FIXME: error handling */
 	    assert(ret == 0);
-
-	    jd->time_bucket = NULL;
 	}
 	qlist_del(&tmp_bucket->bucket_link);
         INIT_QLIST_HEAD(&tmp_bucket->jd_queue);