Skip to contentSkip to conversation

qla4xxx: miscellanous clean-ups

PATCH New Doug Maxey 1 participant 3 messages Aug 5, 2006 – Aug 7, 2006 1 message not in the archive

Subsystems (2)
lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected] [email protected]

Doug Maxey

author
#1 lore raw

PATCH 1/1 qla4xxx: miscellanous clean-ups

Mike,

The following 4 patch series replaces the 2 previous patchsets
Subject: [PATCHSET] qla4xxx: miscellanous clean-ups
Message-ID: [email protected] and
Subject: [PATCHSET ver2] qla4xxx: miscellanous clean-ups

Please drop both previous series. The patches themselves did not change, but mail addressing stuff was thoroughly borken.

Apparently the stgit mailer does not like continuation lines in CC lists, some of the cc'd folks got silently dropped. :-/ One address per line, please. Actually, I think as long as all the addrs were on one line woud be ok. So many MUA's, so many. Oh well.

The duplicate qla4xxx: in the subject line of the individual patches has been fixed. This series has also been compile tested. More extensive testing is in progress on x86-64 and powerpc64.

As with the previous patchset, these patches are on top of the 7-27 submission.

Shortlog:
Doug Maxey:
qla4xxx: Remove funcs with no callers in ql4_init.c
qla4xxx: Add a timeout period and return status from ql4xxx_lock_drvr_wait()
qla4xxx: use dev_xxx on some pci/dma resource alloc warning and error printks
qla4xxx: improve symmetry in buffer codepaths

Diffstats:

 drivers/scsi/qla4xxx/ql4_init.c |  189 ++++-----------------------------------
 drivers/scsi/qla4xxx/ql4_os.c   |   50 ++++------
 2 files changed, 40 insertions(+), 199 deletions(-)

--
++doug

author
#2 lore raw

PATCH 1/1 qla4xxx: cleanup all allocations on failed allocations in module_init()

From: Doug Maxey <[email protected]>

Fix allocation leaks in qla4xxx_module_init() noticed by Ram Pai.

---

 drivers/scsi/qla4xxx/ql4_os.c |   22 +++++++++++++++-------
 1 files changed, 15 insertions(+), 7 deletions(-)
drivers/scsi/qla4xxx/ql4_os.c +15 -7
index 5e10f30..fdba30a 100644
@@ -1805,7 +1805,8 @@ static int __init qla4xxx_module_init(vo
 		printk(KERN_ERR
 		       "%s: Unable to allocate SRB cache..."
 		       "Failing load!\n", DRIVER_NAME);
-		return -ENOMEM;
+		ret = -ENOMEM;
+		goto no_srp_cache;
 	}
 
 	/* Derive version string. */
@@ -1815,16 +1816,23 @@ static int __init qla4xxx_module_init(vo
 
 	qla4xxx_scsi_transport =
 		iscsi_register_transport(&qla4xxx_iscsi_transport);
-	if (!qla4xxx_scsi_transport)
-		return -ENODEV;
+	if (!qla4xxx_scsi_transport) {
+		ret = -ENODEV;
+		goto release_srb_cache;
+	}
 
 	printk(KERN_INFO "QLogic iSCSI HBA Driver\n");
 	ret = pci_module_init(&qla4xxx_pci_driver);
-	if (ret) {
-		kmem_cache_destroy(srb_cachep);
-		iscsi_unregister_transport(&qla4xxx_iscsi_transport);
-	}
+	if (ret)
+		goto unregister_transport;
+
+	return 0;
 
+unregister_transport:
+	iscsi_unregister_transport(&qla4xxx_iscsi_transport);
+release_srb_cache:
+	kmem_cache_destroy(srb_cachep);
+no_srp_cache:
 	return ret;
 }
 
author
#3 lore raw

PATCH 1/1 qla4xxx: @@@Series short description@@@

In reply to Doug Maxey

The following 10 patch series implements some miscellaneous cleanups.
This patchset depends on the previous 2 patchsets
Subject: [PATCH ver3 1/4] qla4xxx: Remove funcs with no callers in ql4_init.c and
Subject: [PATCH] qla4xxx: cleanup all allocations on failed allocations in module_init()

Shortlog:
Doug Maxey:
qla4xxx: move qla4xxx_reset_target defn before call
qla4xxx: make one file funcs static 01
qla4xxx: qla4xxx_mem_alloc-defn-before-use
qla4xxx: qla4xxx_timer defn before use
qla4xxx: qla4xxx_do_dpc defn before use
qla4xxx: qla4xxx_recover_adapter defn before use
qla4xxx: qla4xxx_flush_active_srbs defn before use
qla4xxx: rename del_from_active_array
qla4xxx: qla4xxx_reset_target delete decl

Diffstats:

 drivers/scsi/qla4xxx/ql4_glbl.h |    2
 drivers/scsi/qla4xxx/ql4_isr.c  |   14
 drivers/scsi/qla4xxx/ql4_os.c   | 1183 +++++++++++++++++++--------------------
 3 files changed, 596 insertions(+), 603 deletions(-)

--
++doug