patch-2.1.90 linux/drivers/block/ll_rw_blk.c

• Lines: 45
• Date: Wed Mar 11 15:07:43 1998
• Orig file: v2.1.89/linux/drivers/block/ll_rw_blk.c
• Orig date: Tue Mar 10 10:03:31 1998

diff -u --recursive --new-file v2.1.89/linux/drivers/block/ll_rw_blk.c linux/drivers/block/ll_rw_blk.c
@@ -24,9 +24,6 @@
 
 #include <linux/module.h>
 
-#define ATOMIC_ON()	do { } while (0)
-#define ATOMIC_OFF()	do { } while (0)
-
 /*
  * The request-struct contains all necessary data
  * to load a nr of sectors into memory
@@ -419,8 +416,6 @@
 	 * not to schedule or do something nonatomic
 	 */
 	spin_lock_irqsave(&io_request_lock,flags);
-	ATOMIC_ON();
-
 	req = *get_queue(bh->b_rdev);
 	if (!req) {
 		/* MD and loop can't handle plugging without deadlocking */
@@ -480,7 +475,6 @@
 				continue;
 
 			mark_buffer_clean(bh);
-			ATOMIC_OFF();
 			spin_unlock_irqrestore(&io_request_lock,flags);
 		    	return;
 
@@ -490,7 +484,6 @@
 /* find an unused request. */
 	req = get_request(max_req, bh->b_rdev);
 
-	ATOMIC_OFF();
 	spin_unlock_irqrestore(&io_request_lock,flags);
 
 /* if no request available: if rw_ahead, forget it; otherwise try again blocking.. */
@@ -665,9 +658,7 @@
 			} else {
 				unsigned long flags;
 				spin_lock_irqsave(&io_request_lock,flags);
-				ATOMIC_ON();
 				req[j] = get_request(max_req, rdev);
-				ATOMIC_OFF();
 				spin_unlock_irqrestore(&io_request_lock,flags);
 				if (req[j] == NULL)
 					break;