Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd764695 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: (45 commits)
  [SCSI] qla2xxx: Update version number to 8.03.00-k1.
  [SCSI] qla2xxx: Add ISP81XX support.
  [SCSI] qla2xxx: Use proper request/response queues with MQ instantiations.
  [SCSI] qla2xxx: Correct MQ-chain information retrieval during a firmware dump.
  [SCSI] qla2xxx: Collapse EFT/FCE copy procedures during a firmware dump.
  [SCSI] qla2xxx: Don't pollute kernel logs with ZIO/RIO status messages.
  [SCSI] qla2xxx: Don't fallback to interrupt-polling during re-initialization with MSI-X enabled.
  [SCSI] qla2xxx: Remove support for reading/writing HW-event-log.
  [SCSI] cxgb3i: add missing include
  [SCSI] scsi_lib: fix DID_RESET status problems
  [SCSI] fc transport: restore missing dev_loss_tmo callback to LLDD
  [SCSI] aha152x_cs: Fix regression that keeps driver from using shared interrupts
  [SCSI] sd: Correctly handle 6-byte commands with DIX
  [SCSI] sd: DIF: Fix tagging on platforms with signed char
  [SCSI] sd: DIF: Show app tag on error
  [SCSI] Fix error handling for DIF/DIX
  [SCSI] scsi_lib: don't decrement busy counters when inserting commands
  [SCSI] libsas: fix test for negative unsigned and typos
  [SCSI] a2091, gvp11: kill warn_unused_result warnings
  [SCSI] fusion: Move a dereference below a NULL test
  ...

Fixed up trivial conflict due to moving the async part of sd_probe
around in the async probes vs using dev_set_name() in naming.
parents 97d61b8e ffda8c7d

block/blk-map.c

+10 −9
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ static int __blk_rq_unmap_user(struct bio *bio) 


static int __blk_rq_map_user(struct request_queue *q, struct request *rq,

			     struct rq_map_data *map_data, void __user *ubuf,

			     unsigned int len, int null_mapped, gfp_t gfp_mask)

			     unsigned int len, gfp_t gfp_mask)

{

	unsigned long uaddr;

	struct bio *bio, *orig_bio;
@@ -63,7 +63,7 @@ static int __blk_rq_map_user(struct request_queue *q, struct request *rq, 
	if (IS_ERR(bio))

		return PTR_ERR(bio);



	if (null_mapped)

	if (map_data && map_data->null_mapped)

		bio->bi_flags |= (1 << BIO_NULL_MAPPED);



	orig_bio = bio;
@@ -114,17 +114,15 @@ int blk_rq_map_user(struct request_queue *q, struct request *rq, 
{

	unsigned long bytes_read = 0;

	struct bio *bio = NULL;

	int ret, null_mapped = 0;

	int ret;



	if (len > (q->max_hw_sectors << 9))

		return -EINVAL;

	if (!len)

		return -EINVAL;

	if (!ubuf) {

		if (!map_data || rq_data_dir(rq) != READ)



	if (!ubuf && (!map_data || !map_data->null_mapped))

		return -EINVAL;

		null_mapped = 1;

	}



	while (bytes_read != len) {

		unsigned long map_len, end, start;
@@ -143,13 +141,16 @@ int blk_rq_map_user(struct request_queue *q, struct request *rq, 
			map_len -= PAGE_SIZE;



		ret = __blk_rq_map_user(q, rq, map_data, ubuf, map_len,

					null_mapped, gfp_mask);

					gfp_mask);

		if (ret < 0)

			goto unmap_rq;

		if (!bio)

			bio = rq->bio;

		bytes_read += ret;

		ubuf += ret;



		if (map_data)

			map_data->offset += ret;

	}



	if (!bio_flagged(bio, BIO_USER_MAPPED))

drivers/message/fusion/mptctl.c

+3 −2
Original line number Diff line number Diff line
@@ -308,10 +308,11 @@ static void mptctl_timeout_expired (MPT_IOCTL *ioctl) 
{

	int rc = 1;



	dctlprintk(ioctl->ioc, printk(MYIOC_s_DEBUG_FMT ": Timeout Expired! Host %d\n",

				ioctl->ioc->name, ioctl->ioc->id));

	if (ioctl == NULL)

		return;

	dctlprintk(ioctl->ioc,

		   printk(MYIOC_s_DEBUG_FMT ": Timeout Expired! Host %d\n",

		   ioctl->ioc->name, ioctl->ioc->id));



	ioctl->wait_done = 0;

	if (ioctl->reset & MPTCTL_RESET_OK)

drivers/misc/enclosure.c

+4 −4
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ enclosure_register(struct device *dev, const char *name, int components, 
	edev->edev.class = &enclosure_class;

	edev->edev.parent = get_device(dev);

	edev->cb = cb;

	snprintf(edev->edev.bus_id, BUS_ID_SIZE, "%s", name);

	dev_set_name(&edev->edev, name);

	err = device_register(&edev->edev);

	if (err)

		goto err;
@@ -170,7 +170,7 @@ EXPORT_SYMBOL_GPL(enclosure_unregister); 
static void enclosure_link_name(struct enclosure_component *cdev, char *name)

{

	strcpy(name, "enclosure_device:");

	strcat(name, cdev->cdev.bus_id);

	strcat(name, dev_name(&cdev->cdev));

}



static void enclosure_remove_links(struct enclosure_component *cdev)
@@ -256,9 +256,9 @@ enclosure_component_register(struct enclosure_device *edev, 
	cdev = &ecomp->cdev;

	cdev->parent = get_device(&edev->edev);

	if (name)

		snprintf(cdev->bus_id, BUS_ID_SIZE, "%s", name);

		dev_set_name(cdev, name);

	else

		snprintf(cdev->bus_id, BUS_ID_SIZE, "%u", number);

		dev_set_name(cdev, "%u", number);



	cdev->release = enclosure_component_release;

	cdev->groups = enclosure_groups;

drivers/scsi/NCR_D700.c

+1 −1
Original line number Diff line number Diff line
@@ -318,7 +318,7 @@ NCR_D700_probe(struct device *dev) 
		return -ENOMEM;



	p->dev = dev;

	snprintf(p->name, sizeof(p->name), "D700(%s)", dev->bus_id);

	snprintf(p->name, sizeof(p->name), "D700(%s)", dev_name(dev));

	if (request_irq(irq, NCR_D700_intr, IRQF_SHARED, p->name, p)) {

		printk(KERN_ERR "D700: request_irq failed\n");

		kfree(p);

drivers/scsi/a2091.c

+12 −6
Original line number Diff line number Diff line
@@ -169,10 +169,8 @@ int __init a2091_detect(struct scsi_host_template *tpnt) 
	    continue;



	instance = scsi_register (tpnt, sizeof (struct WD33C93_hostdata));

	if (instance == NULL) {

	    release_mem_region(address, 256);

	    continue;

	}

	if (instance == NULL)

	    goto release;

	instance->base = ZTWO_VADDR(address);

	instance->irq = IRQ_AMIGA_PORTS;

	instance->unique_id = z->slotaddr;
@@ -183,10 +181,18 @@ int __init a2091_detect(struct scsi_host_template *tpnt) 
	HDATA(instance)->fast = 0;

	HDATA(instance)->dma_mode = CTRL_DMA;

	wd33c93_init(instance, regs, dma_setup, dma_stop, WD33C93_FS_8_10);

	request_irq(IRQ_AMIGA_PORTS, a2091_intr, IRQF_SHARED, "A2091 SCSI",

		    instance);

	if (request_irq(IRQ_AMIGA_PORTS, a2091_intr, IRQF_SHARED, "A2091 SCSI",

			instance))

	    goto unregister;

	DMA(instance)->CNTR = CNTR_PDMD | CNTR_INTEN;

	num_a2091++;

	continue;



unregister:

	scsi_unregister(instance);

	wd33c93_release();

release:

	release_mem_region(address, 256);

    }



    return num_a2091;