From: James Bottomley <jejb@titanic>
Date: Mon, 18 Apr 2005 18:45:00 +0000 (-0500)
Subject: merge by hand (scsi_device.h)
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c46f2ffb9e7fce7208c2639790e1ade42e00b146;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

merge by hand (scsi_device.h)
---

c46f2ffb9e7fce7208c2639790e1ade42e00b146
diff --cc include/scsi/scsi_device.h
index fe9571d2e306,7099d2ce967e..c018020d9160
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@@ -43,8 -43,9 +43,9 @@@ struct scsi_device 
  	struct list_head    siblings;   /* list of all devices on this host */
  	struct list_head    same_target_siblings; /* just the devices sharing same target id */
  
 +	/* this is now protected by the request_queue->queue_lock */
- 	volatile unsigned short device_busy;	/* commands actually active on low-level */
+ 	unsigned int device_busy;	/* commands actually active on
+ 					 * low-level. protected by queue_lock. */
 -	spinlock_t sdev_lock;           /* also the request queue_lock */
  	spinlock_t list_lock;
  	struct list_head cmd_list;	/* queue of in use SCSI Command structures */
  	struct list_head starved_entry;