diff -u -r linux-coda-6.2/linux2.4/upcall.c linux-coda-6.2-mod/linux2.4/upcall.c
--- linux-coda-6.2/linux2.4/upcall.c	2005-09-29 12:12:29.000000000 -0600
+++ linux-coda-6.2-mod/linux2.4/upcall.c	2005-09-29 12:13:05.000000000 -0600
@@ -631,7 +631,7 @@
  */
 static void block_signals(sigset_t *old)
 {
-	spin_lock_irq(&current->sigmask_lock);
+	spin_lock_irq(&current->sighand->siglock);
 	*old = current->blocked;
 
 	sigfillset(&current->blocked);
@@ -639,16 +639,16 @@
 	sigdelset(&current->blocked, SIGSTOP);
 	sigdelset(&current->blocked, SIGINT);
 
-	recalc_sigpending(current);
-	spin_unlock_irq(&current->sigmask_lock);
+	recalc_sigpending();
+	spin_unlock_irq(&current->sighand->siglock);
 }
 
 static void unblock_signals(sigset_t *old)
 {
-	spin_lock_irq(&current->sigmask_lock);
+	spin_lock_irq(&current->sighand->siglock);
 	current->blocked = *old;
-	recalc_sigpending(current);
-	spin_unlock_irq(&current->sigmask_lock);
+	recalc_sigpending();
+	spin_unlock_irq(&current->sighand->siglock);
 }
 
 /* Don't allow signals to interrupt the following upcalls before venus
@@ -669,8 +669,6 @@
 	sigset_t old;
 	int blocked;
 
-	vmp->uc_posttime = jiffies;
-
 	if (coda_upcall_timestamping)
 		do_gettimeofday(&begin);
 
@@ -790,11 +788,11 @@
 	 * ENODEV.  */
 
 	/* Go to sleep.  Wake up on signals only after the timeout. */
-	runtime = coda_waitfor_upcall(req, vcommp);
+	runtime = coda_waitfor_upcall(req);
 	coda_upcall_stats(((union inputArgs *)buffer)->ih.opcode, runtime);
 
 	CDEBUG(D_TIMING, "opc: %d time: %ld uniq: %d size: %d\n",
-	       req->uc_opcode, jiffies - req->uc_posttime, 
+	       req->uc_opcode, jiffies, 
 	       req->uc_unique, req->uc_outSize);
 	CDEBUG(D_UPCALL, 
 	       "..process %d woken up by Venus for req at %p, data at %p\n", 
Only in linux-coda-6.2-mod/linux2.4: .upcall.c.swp