patch-2.3.99-pre6 linux/drivers/scsi/scsi.h

• Lines: 18
• Date: Wed Apr 26 15:30:44 2000
• Orig file: v2.3.99-pre5/linux/drivers/scsi/scsi.h
• Orig date: Tue Mar 14 19:10:40 2000

diff -u --recursive --new-file v2.3.99-pre5/linux/drivers/scsi/scsi.h linux/drivers/scsi/scsi.h
@@ -105,7 +105,7 @@
  */
 #define ASSERT_LOCK(_LOCK, _COUNT)
 
-#if defined(__SMP__) && defined(CONFIG_USER_DEBUG)
+#if defined(CONFIG_SMP) && defined(CONFIG_USER_DEBUG)
 #undef ASSERT_LOCK
 #define ASSERT_LOCK(_LOCK,_COUNT)       \
         { if( (_LOCK)->lock != _COUNT )   \
@@ -756,6 +756,8 @@
 
 	unsigned underflow;	/* Return error if less than
 				   this amount is transfered */
+	unsigned old_underflow;	/* save underflow here when reusing the
+				 * command for error handling */
 
 	unsigned transfersize;	/* How much we are guaranteed to
 				   transfer with each SCSI transfer