patch-2.3.1 linux/fs/hfs/bnode.c

• Lines: 18
• Date: Wed May 12 13:27:37 1999
• Orig file: v2.3.0/linux/fs/hfs/bnode.c
• Orig date: Mon Nov 2 09:35:16 1998

diff -u --recursive --new-file v2.3.0/linux/fs/hfs/bnode.c linux/fs/hfs/bnode.c
@@ -228,7 +228,7 @@
 			break;
 
 		case HFS_LOCK_NONE:
-			while (bn->lock || bn->wqueue) {
+			while (bn->lock || witqueue_active(&bn->wqueue)) {
 				hfs_sleep_on(&bn->rqueue);
 			}
 			++bn->count;
@@ -382,7 +382,7 @@
 	/* We update the lock state of the node if it is still in use
 	   or if it is "sticky" (such as the B-tree head and root).
 	   Otherwise we just delete it.	 */
-	if ((bn->count > 1) || (bn->rqueue) || (bn->sticky != HFS_NOT_STICKY)) {
+	if ((bn->count > 1) || (waitqueue_active(&bn->rqueue)) || (bn->sticky != HFS_NOT_STICKY)) {
 		hfs_bnode_lock(bnr, HFS_LOCK_NONE);
 	} else {
 		/* dirty buffer if we (might) have modified it */