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

Commit 211c8d49 authored Jul 27, 2008 by Linus Torvalds

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: (59 commits)
  [SCSI] replace __FUNCTION__ with __func__
  [SCSI] extend the last_sector_bug flag to cover more sectors
  [SCSI] qla2xxx: Update version number to 8.02.01-k6.
  [SCSI] qla2xxx: Additional NPIV corrections.
  [SCSI] qla2xxx: suppress uninitialized-var warning
  [SCSI] qla2xxx: use memory_read_from_buffer()
  [SCSI] qla2xxx: Issue proper ISP callbacks during stop-firmware.
  [SCSI] ch: fix ch_remove oops
  [SCSI] 3w-9xxx: add MSI support and misc fixes
  [SCSI] scsi_lib: use blk_rq_tagged in scsi_request_fn
  [SCSI] ibmvfc: Update driver version to 1.0.1
  [SCSI] ibmvfc: Add ADISC support
  [SCSI] ibmvfc: Miscellaneous fixes
  [SCSI] ibmvfc: Fix hang on module removal
  [SCSI] ibmvfc: Target refcounting fixes
  [SCSI] ibmvfc: Reduce unnecessary log noise
  [SCSI] sym53c8xx: free luntbl in sym_hcb_free
  [SCSI] scsi_scan.c: Release mutex in error handling code
  [SCSI] scsi_eh_prep_cmnd should save scmd->underflow
  [SCSI] sd: Support for SCSI disk (SBC) Data Integrity Field
  ...

parents 7a82323d cadbd4a5

drivers/md/dm-mpath.c

+13 −0

Original line number	Diff line number	Diff line
		@@ -147,9 +147,12 @@ static struct priority_group *alloc_priority_group(void)
		static void free_pgpaths(struct list_head pgpaths, struct dm_target ti)
		{
		struct pgpath pgpath, tmp;
		struct multipath *m = ti->private;

		list_for_each_entry_safe(pgpath, tmp, pgpaths, list) {
		list_del(&pgpath->list);
		if (m->hw_handler_name)
		scsi_dh_detach(bdev_get_queue(pgpath->path.dev->bdev));
		dm_put_device(ti, pgpath->path.dev);
		free_pgpath(pgpath);
		}
		@@ -548,6 +551,7 @@ static struct pgpath parse_path(struct arg_set as, struct path_selector *ps,
		{
		int r;
		struct pgpath *p;
		struct multipath *m = ti->private;

		/* we need at least a path arg */
		if (as->argc < 1) {
		@@ -566,6 +570,15 @@ static struct pgpath parse_path(struct arg_set as, struct path_selector *ps,
		goto bad;
		}

		if (m->hw_handler_name) {
		r = scsi_dh_attach(bdev_get_queue(p->path.dev->bdev),
		m->hw_handler_name);
		if (r < 0) {
		dm_put_device(ti, p->path.dev);
		goto bad;
		}
		}

		r = ps->type->add_path(ps, &p->path, as->argc, as->argv, &ti->error);
		if (r) {
		dm_put_device(ti, p->path.dev);

drivers/message/fusion/mptbase.c

+12 −12

Original line number	Diff line number	Diff line
		@@ -275,10 +275,10 @@ mpt_fault_reset_work(struct work_struct *work)
		printk(MYIOC_s_WARN_FMT "IOC is in FAULT state (%04xh)!!!\n",
		ioc->name, ioc_raw_state & MPI_DOORBELL_DATA_MASK);
		printk(MYIOC_s_WARN_FMT "Issuing HardReset from %s!!\n",
		ioc->name, __FUNCTION__);
		ioc->name, __func__);
		rc = mpt_HardResetHandler(ioc, CAN_SLEEP);
		printk(MYIOC_s_WARN_FMT "%s: HardReset: %s\n", ioc->name,
		__FUNCTION__, (rc == 0) ? "success" : "failed");
		__func__, (rc == 0) ? "success" : "failed");
		ioc_raw_state = mpt_GetIocState(ioc, 0);
		if ((ioc_raw_state & MPI_IOC_STATE_MASK) == MPI_IOC_STATE_FAULT)
		printk(MYIOC_s_WARN_FMT "IOC is in FAULT state after "
		@@ -356,7 +356,7 @@ mpt_turbo_reply(MPT_ADAPTER *ioc, u32 pa)
		if (!cb_idx \|\| cb_idx >= MPT_MAX_PROTOCOL_DRIVERS \|\|
		MptCallbacks[cb_idx] == NULL) {
		printk(MYIOC_s_WARN_FMT "%s: Invalid cb_idx (%d)!\n",
		__FUNCTION__, ioc->name, cb_idx);
		__func__, ioc->name, cb_idx);
		goto out;
		}

		@@ -420,7 +420,7 @@ mpt_reply(MPT_ADAPTER *ioc, u32 pa)
		if (!cb_idx \|\| cb_idx >= MPT_MAX_PROTOCOL_DRIVERS \|\|
		MptCallbacks[cb_idx] == NULL) {
		printk(MYIOC_s_WARN_FMT "%s: Invalid cb_idx (%d)!\n",
		__FUNCTION__, ioc->name, cb_idx);
		__func__, ioc->name, cb_idx);
		freeme = 0;
		goto out;
		}
		@@ -2434,7 +2434,7 @@ mpt_adapter_disable(MPT_ADAPTER *ioc)

		if (ioc->cached_fw != NULL) {
		ddlprintk(ioc, printk(MYIOC_s_DEBUG_FMT "%s: Pushing FW onto "
		"adapter\n", __FUNCTION__, ioc->name));
		"adapter\n", __func__, ioc->name));
		if ((ret = mpt_downloadboot(ioc, (MpiFwHeader_t *)
		ioc->cached_fw, CAN_SLEEP)) < 0) {
		printk(MYIOC_s_WARN_FMT
		@@ -3693,7 +3693,7 @@ mpt_diag_reset(MPT_ADAPTER *ioc, int ignore, int sleepFlag)

		if (ioc->pcidev->device == MPI_MANUFACTPAGE_DEVID_SAS1078) {
		drsprintk(ioc, printk(MYIOC_s_WARN_FMT "%s: Doorbell=%p; 1078 reset "
		"address=%p\n", ioc->name, __FUNCTION__,
		"address=%p\n", ioc->name, __func__,
		&ioc->chip->Doorbell, &ioc->chip->Reset_1078));
		CHIPREG_WRITE32(&ioc->chip->Reset_1078, 0x07);
		if (sleepFlag == CAN_SLEEP)
		@@ -4742,12 +4742,12 @@ mptbase_sas_persist_operation(MPT_ADAPTER *ioc, u8 persist_opcode)
		break;
		}

		printk("%s: persist_opcode=%x\n",__FUNCTION__, persist_opcode);
		printk("%s: persist_opcode=%x\n",__func__, persist_opcode);

		/* Get a MF for this command.
		*/
		if ((mf = mpt_get_msg_frame(mpt_base_index, ioc)) == NULL) {
		printk("%s: no msg frames!\n",__FUNCTION__);
		printk("%s: no msg frames!\n",__func__);
		return -1;
		}

		@@ -4771,13 +4771,13 @@ mptbase_sas_persist_operation(MPT_ADAPTER *ioc, u8 persist_opcode)
		(SasIoUnitControlReply_t *)ioc->persist_reply_frame;
		if (le16_to_cpu(sasIoUnitCntrReply->IOCStatus) != MPI_IOCSTATUS_SUCCESS) {
		printk("%s: IOCStatus=0x%X IOCLogInfo=0x%X\n",
		__FUNCTION__,
		__func__,
		sasIoUnitCntrReply->IOCStatus,
		sasIoUnitCntrReply->IOCLogInfo);
		return -1;
		}

		printk("%s: success\n",__FUNCTION__);
		printk("%s: success\n",__func__);
		return 0;
		}

		@@ -5784,7 +5784,7 @@ SendEventAck(MPT_ADAPTER ioc, EventNotificationReply_t evnp)

		if ((pAck = (EventAck_t *) mpt_get_msg_frame(mpt_base_index, ioc)) == NULL) {
		dfailprintk(ioc, printk(MYIOC_s_WARN_FMT "%s, no msg frames!!\n",
		ioc->name,__FUNCTION__));
		ioc->name,__func__));
		return -1;
		}

drivers/message/fusion/mptctl.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -505,7 +505,7 @@ mptctl_event_process(MPT_ADAPTER ioc, EventNotificationReply_t pEvReply)
		event = le32_to_cpu(pEvReply->Event) & 0xFF;

		dctlprintk(ioc, printk(MYIOC_s_DEBUG_FMT "%s() called\n",
		ioc->name, __FUNCTION__));
		ioc->name, __func__));
		if(async_queue == NULL)
		return 1;

		@@ -2482,7 +2482,7 @@ mptctl_hp_hostinfo(unsigned long arg, unsigned int data_size)
		*/
		if ((mf = mpt_get_msg_frame(mptctl_id, ioc)) == NULL) {
		dfailprintk(ioc, printk(MYIOC_s_WARN_FMT "%s, no msg frames!!\n",
		ioc->name,__FUNCTION__));
		ioc->name,__func__));
		goto out;
		}

drivers/message/fusion/mptfc.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -231,28 +231,28 @@ static int
		mptfc_abort(struct scsi_cmnd *SCpnt)
		{
		return
		mptfc_block_error_handler(SCpnt, mptscsih_abort, __FUNCTION__);
		mptfc_block_error_handler(SCpnt, mptscsih_abort, __func__);
		}

		static int
		mptfc_dev_reset(struct scsi_cmnd *SCpnt)
		{
		return
		mptfc_block_error_handler(SCpnt, mptscsih_dev_reset, __FUNCTION__);
		mptfc_block_error_handler(SCpnt, mptscsih_dev_reset, __func__);
		}

		static int
		mptfc_bus_reset(struct scsi_cmnd *SCpnt)
		{
		return
		mptfc_block_error_handler(SCpnt, mptscsih_bus_reset, __FUNCTION__);
		mptfc_block_error_handler(SCpnt, mptscsih_bus_reset, __func__);
		}

		static int
		mptfc_host_reset(struct scsi_cmnd *SCpnt)
		{
		return
		mptfc_block_error_handler(SCpnt, mptscsih_host_reset, __FUNCTION__);
		mptfc_block_error_handler(SCpnt, mptscsih_host_reset, __func__);
		}

		static void

drivers/message/fusion/mptlan.c

+13 −13

Original line number	Diff line number	Diff line
		@@ -610,7 +610,7 @@ mpt_lan_send_turbo(struct net_device *dev, u32 tmsg)

		dioprintk((KERN_INFO MYNAM ": %s/%s: @%s, skb %p sent.\n",
		IOC_AND_NETDEV_NAMES_s_s(dev),
		__FUNCTION__, sent));
		__func__, sent));

		priv->SendCtl[ctx].skb = NULL;
		pci_unmap_single(mpt_dev->pcidev, priv->SendCtl[ctx].dma,
		@@ -676,7 +676,7 @@ mpt_lan_send_reply(struct net_device dev, LANSendReply_t pSendRep)

		dioprintk((KERN_INFO MYNAM ": %s/%s: @%s, skb %p sent.\n",
		IOC_AND_NETDEV_NAMES_s_s(dev),
		__FUNCTION__, sent));
		__func__, sent));

		priv->SendCtl[ctx].skb = NULL;
		pci_unmap_single(mpt_dev->pcidev, priv->SendCtl[ctx].dma,
		@@ -715,7 +715,7 @@ mpt_lan_sdu_send (struct sk_buff skb, struct net_device dev)
		u16 cur_naa = 0x1000;

		dioprintk((KERN_INFO MYNAM ": %s called, skb_addr = %p\n",
		__FUNCTION__, skb));
		__func__, skb));

		spin_lock_irqsave(&priv->txfidx_lock, flags);
		if (priv->mpt_txfidx_tail < 0) {
		@@ -723,7 +723,7 @@ mpt_lan_sdu_send (struct sk_buff skb, struct net_device dev)
		spin_unlock_irqrestore(&priv->txfidx_lock, flags);

		printk (KERN_ERR "%s: no tx context available: %u\n",
		__FUNCTION__, priv->mpt_txfidx_tail);
		__func__, priv->mpt_txfidx_tail);
		return 1;
		}

		@@ -733,7 +733,7 @@ mpt_lan_sdu_send (struct sk_buff skb, struct net_device dev)
		spin_unlock_irqrestore(&priv->txfidx_lock, flags);

		printk (KERN_ERR "%s: Unable to alloc request frame\n",
		__FUNCTION__);
		__func__);
		return 1;
		}

		@@ -1208,7 +1208,7 @@ mpt_lan_post_receive_buckets(struct mpt_lan_priv *priv)

		dioprintk((KERN_INFO MYNAM ": %s/%s: @%s, Start_buckets = %u, buckets_out = %u\n",
		IOC_AND_NETDEV_NAMES_s_s(dev),
		__FUNCTION__, buckets, curr));
		__func__, buckets, curr));

		max = (mpt_dev->req_sz - MPT_LAN_RECEIVE_POST_REQUEST_SIZE) /
		(MPT_LAN_TRANSACTION32_SIZE + sizeof(SGESimple64_t));
		@@ -1217,9 +1217,9 @@ mpt_lan_post_receive_buckets(struct mpt_lan_priv *priv)
		mf = mpt_get_msg_frame(LanCtx, mpt_dev);
		if (mf == NULL) {
		printk (KERN_ERR "%s: Unable to alloc request frame\n",
		__FUNCTION__);
		__func__);
		dioprintk((KERN_ERR "%s: %u buckets remaining\n",
		__FUNCTION__, buckets));
		__func__, buckets));
		goto out;
		}
		pRecvReq = (LANReceivePostRequest_t *) mf;
		@@ -1244,7 +1244,7 @@ mpt_lan_post_receive_buckets(struct mpt_lan_priv *priv)
		spin_lock_irqsave(&priv->rxfidx_lock, flags);
		if (priv->mpt_rxfidx_tail < 0) {
		printk (KERN_ERR "%s: Can't alloc context\n",
		__FUNCTION__);
		__func__);
		spin_unlock_irqrestore(&priv->rxfidx_lock,
		flags);
		break;
		@@ -1267,7 +1267,7 @@ mpt_lan_post_receive_buckets(struct mpt_lan_priv *priv)
		if (skb == NULL) {
		printk (KERN_WARNING
		MYNAM "/%s: Can't alloc skb\n",
		__FUNCTION__);
		__func__);
		priv->mpt_rxfidx[++priv->mpt_rxfidx_tail] = ctx;
		spin_unlock_irqrestore(&priv->rxfidx_lock, flags);
		break;
		@@ -1305,7 +1305,7 @@ mpt_lan_post_receive_buckets(struct mpt_lan_priv *priv)

		if (pSimple == NULL) {
		/**/ printk (KERN_WARNING MYNAM "/%s: No buckets posted\n",
		/**/ __FUNCTION__);
		/**/ __func__);
		mpt_free_msg_frame(mpt_dev, mf);
		goto out;
		}
		@@ -1329,9 +1329,9 @@ mpt_lan_post_receive_buckets(struct mpt_lan_priv *priv)

		out:
		dioprintk((KERN_INFO MYNAM "/%s: End_buckets = %u, priv->buckets_out = %u\n",
		__FUNCTION__, buckets, atomic_read(&priv->buckets_out)));
		__func__, buckets, atomic_read(&priv->buckets_out)));
		dioprintk((KERN_INFO MYNAM "/%s: Posted %u buckets and received %u back\n",
		__FUNCTION__, priv->total_posted, priv->total_received));
		__func__, priv->total_posted, priv->total_received));

		clear_bit(0, &priv->post_buckets_active);
		}