From: Mike S. <sh...@us...> - 2003-05-29 13:58:58
|
Update of /cvsroot/lustre/lustre/ldlm In directory sc8-pr-cvs1:/tmp/cvs-serv32644 Modified Files: Tag: b_devel ldlm_lockd.c Log Message: Phil noticed that I'd been stupid, and accidentally removed some needed return statements in my last checkin. Better now! Index: ldlm_lockd.c =================================================================== RCS file: /cvsroot/lustre/lustre/ldlm/ldlm_lockd.c,v retrieving revision 1.131.2.37 retrieving revision 1.131.2.38 diff -u -w -b -B -p -r1.131.2.37 -r1.131.2.38 --- ldlm_lockd.c 28 May 2003 21:17:24 -0000 1.131.2.37 +++ ldlm_lockd.c 29 May 2003 13:37:56 -0000 1.131.2.38 @@ -186,6 +186,7 @@ static int ldlm_add_waiting_lock(struct spin_unlock_bh(&waiting_locks_spinlock); /* We drop this ref when we get removed from the list. */ class_export_get(lock->l_export); + return 0; } /* @@ -200,6 +201,7 @@ int ldlm_del_waiting_lock(struct ldlm_lo if (lock->l_export == NULL) { /* We don't have a "waiting locks list" on clients. */ LDLM_DEBUG(lock, "client lock: no-op"); + return 0; } spin_lock_bh(&waiting_locks_spinlock); @@ -207,7 +209,7 @@ int ldlm_del_waiting_lock(struct ldlm_lo if (list_empty(&lock->l_pending_chain)) { spin_unlock_bh(&waiting_locks_spinlock); LDLM_DEBUG(lock, "wasn't waiting"); - RETURN(0); + return 0; } list_next = lock->l_pending_chain.next; @@ -229,6 +231,7 @@ int ldlm_del_waiting_lock(struct ldlm_lo /* We got this ref when we were added to the list. */ class_export_put(lock->l_export); LDLM_DEBUG(lock, "removed"); + return 1; } #else /* !__KERNEL__ */ |