Commit 2cca775b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (137 commits)
  [SCSI] iscsi: bidi support for iscsi_tcp
  [SCSI] iscsi: bidi support at the generic libiscsi level
  [SCSI] iscsi: extended cdb support
  [SCSI] zfcp: Fix error handling for blocked unit for send FCP command
  [SCSI] zfcp: Remove zfcp_erp_wait from slave destory handler to fix deadlock
  [SCSI] zfcp: fix 31 bit compile warnings
  [SCSI] bsg: no need to set BSG_F_BLOCK bit in bsg_complete_all_commands
  [SCSI] bsg: remove minor in struct bsg_device
  [SCSI] bsg: use better helper list functions
  [SCSI] bsg: replace kobject_get with blk_get_queue
  [SCSI] bsg: takes a ref to struct device in fops->open
  [SCSI] qla1280: remove version check
  [SCSI] libsas: fix endianness bug in sas_ata
  [SCSI] zfcp: fix compiler warning caused by poking inside new semaphore (linux-next)
  [SCSI] aacraid: Do not describe check_reset parameter with its value
  [SCSI] aacraid: Fix down_interruptible() to check the return value
  [SCSI] sun3_scsi_vme: add MODULE_LICENSE
  [SCSI] st: rename flush_write_buffer()
  [SCSI] tgt: use KMEM_CACHE macro
  [SCSI] initio: fix big endian problems for auto request sense
  ...
parents eddeb0e2 94795b61

Documentation/scsi/st.txt

+11 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ This file contains brief information about the SCSI tape driver. 
The driver is currently maintained by Kai Mäkisara (email

Kai.Makisara@kolumbus.fi)



Last modified: Mon Mar  7 21:14:44 2005 by kai.makisara

Last modified: Sun Feb 24 21:59:07 2008 by kai.makisara





BASICS
@@ -133,6 +133,11 @@ the defaults set by the user. The value -1 means the default is not set. The 
file 'dev' contains the device numbers corresponding to this device. The links

'device' and 'driver' point to the SCSI device and driver entries.



Each directory also contains the entry 'options' which shows the currently

enabled driver and mode options. The value in the file is a bit mask where the

bit definitions are the same as those used with MTSETDRVBUFFER in setting the

options.



A link named 'tape' is made from the SCSI device directory to the class

directory corresponding to the mode 0 auto-rewind device (e.g., st0).
@@ -372,6 +377,11 @@ MTSETDRVBUFFER 
	     MT_ST_SYSV sets the SYSV semantics (mode)

	     MT_ST_NOWAIT enables immediate mode (i.e., don't wait for

	        the command to finish) for some commands (e.g., rewind)

	     MT_ST_SILI enables setting the SILI bit in SCSI commands when

		reading in variable block mode to enhance performance when

		reading blocks shorter than the byte count; set this only

		if you are sure that the drive supports SILI and the HBA

		correctly returns transfer residuals

	     MT_ST_DEBUGGING debugging (global; debugging must be

		compiled into the driver)

	MT_ST_SETBOOLEANS

arch/ia64/hp/sim/simscsi.c

+4 −19
Original line number Diff line number Diff line
@@ -201,22 +201,6 @@ simscsi_readwrite10 (struct scsi_cmnd *sc, int mode) 
	simscsi_sg_readwrite(sc, mode, offset);

}



static void simscsi_fillresult(struct scsi_cmnd *sc, char *buf, unsigned len)

{



	int i;

	unsigned thislen;

	struct scatterlist *slp;



	scsi_for_each_sg(sc, slp, scsi_sg_count(sc), i) {

		if (!len)

			break;

		thislen = min(len, slp->length);

		memcpy(sg_virt(slp), buf, thislen);

		len -= thislen;

	}

}



static int

simscsi_queuecommand (struct scsi_cmnd *sc, void (*done)(struct scsi_cmnd *))

{
@@ -258,7 +242,7 @@ simscsi_queuecommand (struct scsi_cmnd *sc, void (*done)(struct scsi_cmnd *)) 
			buf[6] = 0;	/* reserved */

			buf[7] = 0;	/* various flags */

			memcpy(buf + 8, "HP      SIMULATED DISK  0.00",  28);

			simscsi_fillresult(sc, buf, 36);

			scsi_sg_copy_from_buffer(sc, buf, 36);

			sc->result = GOOD;

			break;
@@ -306,14 +290,15 @@ simscsi_queuecommand (struct scsi_cmnd *sc, void (*done)(struct scsi_cmnd *)) 
			buf[5] = 0;

			buf[6] = 2;

			buf[7] = 0;

			simscsi_fillresult(sc, buf, 8);

			scsi_sg_copy_from_buffer(sc, buf, 8);

			sc->result = GOOD;

			break;



		      case MODE_SENSE:

		      case MODE_SENSE_10:

			/* sd.c uses this to determine whether disk does write-caching. */

			simscsi_fillresult(sc, (char *)empty_zero_page, scsi_bufflen(sc));

			scsi_sg_copy_from_buffer(sc, (char *)empty_zero_page,

						 PAGE_SIZE);

			sc->result = GOOD;

			break;

block/bsg.c

+29 −23
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ struct bsg_device { 
	struct list_head done_list;

	struct hlist_node dev_list;

	atomic_t ref_count;

	int minor;

	int queued_cmds;

	int done_cmds;

	wait_queue_head_t wq_done;
@@ -368,7 +367,7 @@ static struct bsg_command *bsg_next_done_cmd(struct bsg_device *bd) 


	spin_lock_irq(&bd->lock);

	if (bd->done_cmds) {

		bc = list_entry(bd->done_list.next, struct bsg_command, list);

		bc = list_first_entry(&bd->done_list, struct bsg_command, list);

		list_del(&bc->list);

		bd->done_cmds--;

	}
@@ -468,8 +467,6 @@ static int bsg_complete_all_commands(struct bsg_device *bd) 


	dprintk("%s: entered\n", bd->name);



	set_bit(BSG_F_BLOCK, &bd->flags);



	/*

	 * wait for all commands to complete

	 */
@@ -705,6 +702,7 @@ static struct bsg_device *bsg_alloc_device(void) 
static int bsg_put_device(struct bsg_device *bd)

{

	int ret = 0;

	struct device *dev = bd->queue->bsg_dev.dev;



	mutex_lock(&bsg_mutex);
@@ -730,6 +728,7 @@ static int bsg_put_device(struct bsg_device *bd) 
	kfree(bd);

out:

	mutex_unlock(&bsg_mutex);

	put_device(dev);

	return ret;

}
@@ -738,22 +737,26 @@ static struct bsg_device *bsg_add_device(struct inode *inode, 
					 struct file *file)

{

	struct bsg_device *bd;

	int ret;

#ifdef BSG_DEBUG

	unsigned char buf[32];

#endif

	ret = blk_get_queue(rq);

	if (ret)

		return ERR_PTR(-ENXIO);



	bd = bsg_alloc_device();

	if (!bd)

	if (!bd) {

		blk_put_queue(rq);

		return ERR_PTR(-ENOMEM);

	}



	bd->queue = rq;

	kobject_get(&rq->kobj);

	bsg_set_block(bd, file);



	atomic_set(&bd->ref_count, 1);

	bd->minor = iminor(inode);

	mutex_lock(&bsg_mutex);

	hlist_add_head(&bd->dev_list, bsg_dev_idx_hash(bd->minor));

	hlist_add_head(&bd->dev_list, bsg_dev_idx_hash(iminor(inode)));



	strncpy(bd->name, rq->bsg_dev.class_dev->class_id, sizeof(bd->name) - 1);

	dprintk("bound to <%s>, max queue %d\n",
@@ -763,23 +766,21 @@ static struct bsg_device *bsg_add_device(struct inode *inode, 
	return bd;

}



static struct bsg_device *__bsg_get_device(int minor)

static struct bsg_device *__bsg_get_device(int minor, struct request_queue *q)

{

	struct bsg_device *bd = NULL;

	struct bsg_device *bd;

	struct hlist_node *entry;



	mutex_lock(&bsg_mutex);



	hlist_for_each(entry, bsg_dev_idx_hash(minor)) {

		bd = hlist_entry(entry, struct bsg_device, dev_list);

		if (bd->minor == minor) {

	hlist_for_each_entry(bd, entry, bsg_dev_idx_hash(minor), dev_list) {

		if (bd->queue == q) {

			atomic_inc(&bd->ref_count);

			break;

			goto found;

		}



		bd = NULL;

	}



	bd = NULL;

found:

	mutex_unlock(&bsg_mutex);

	return bd;

}
@@ -789,21 +790,27 @@ static struct bsg_device *bsg_get_device(struct inode *inode, struct file *file) 
	struct bsg_device *bd;

	struct bsg_class_device *bcd;



	bd = __bsg_get_device(iminor(inode));

	if (bd)

		return bd;



	/*

	 * find the class device

	 */

	mutex_lock(&bsg_mutex);

	bcd = idr_find(&bsg_minor_idr, iminor(inode));

	if (bcd)

		get_device(bcd->dev);

	mutex_unlock(&bsg_mutex);



	if (!bcd)

		return ERR_PTR(-ENODEV);



	return bsg_add_device(inode, bcd->queue, file);

	bd = __bsg_get_device(iminor(inode), bcd->queue);

	if (bd)

		return bd;



	bd = bsg_add_device(inode, bcd->queue, file);

	if (IS_ERR(bd))

		put_device(bcd->dev);



	return bd;

}



static int bsg_open(struct inode *inode, struct file *file)
@@ -942,7 +949,6 @@ void bsg_unregister_queue(struct request_queue *q) 
	class_device_unregister(bcd->class_dev);

	put_device(bcd->dev);

	bcd->class_dev = NULL;

	bcd->dev = NULL;

	mutex_unlock(&bsg_mutex);

}

EXPORT_SYMBOL_GPL(bsg_unregister_queue);

drivers/ata/libata-scsi.c

+1 −5
Original line number Diff line number Diff line
@@ -2332,11 +2332,7 @@ void ata_scsi_set_sense(struct scsi_cmnd *cmd, u8 sk, u8 asc, u8 ascq) 
{

	cmd->result = (DRIVER_SENSE << 24) | SAM_STAT_CHECK_CONDITION;



	cmd->sense_buffer[0] = 0x70;	/* fixed format, current */

	cmd->sense_buffer[2] = sk;

	cmd->sense_buffer[7] = 18 - 8;	/* additional sense length */

	cmd->sense_buffer[12] = asc;

	cmd->sense_buffer[13] = ascq;

	scsi_build_sense_buffer(0, cmd->sense_buffer, sk, asc, ascq);

}



/**

drivers/base/transport_class.c

+2 −1
Original line number Diff line number Diff line
@@ -108,7 +108,8 @@ EXPORT_SYMBOL_GPL(anon_transport_class_register); 
 */

void anon_transport_class_unregister(struct anon_transport_class *atc)

{

	attribute_container_unregister(&atc->container);

	if (unlikely(attribute_container_unregister(&atc->container)))

		BUG();

}

EXPORT_SYMBOL_GPL(anon_transport_class_unregister);

CRA Git | Maintained and supported by SUSTech CRA and CCSE