Home Home > GIT Browse > openSUSE-15.0
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHannes Reinecke <hare@suse.de>2010-04-12 12:31:11 +0200
committerHannes Reinecke <hare@suse.de>2010-04-12 12:31:11 +0200
commit865fa36c6176440c0d0bdb945700f0af472b6128 (patch)
tree91ebf2829fce01d8afef2da269f7a1129341a1f6
parent76403729ad68394d5d17f0419fbcd811f9280816 (diff)
- patches.drivers/cnic-give-a-chance-for-the-uio-device-to-be-opened:rpm-2.6.32.11-0.3
Fixup compilation warnings. - patches.drivers/qla2xxx-8.03.01.03.11.1-k8-update: Fixup compilation warnings. - patches.fixes/ipr-strstrip-retval-fix: Fixup compilation warnings in ipr. - patches.suse/dm-mpath-leastpending-select-path-fix: Compile warning in dm-least-pending.
-rw-r--r--kernel-source.changes12
-rw-r--r--patches.drivers/cnic-give-a-chance-for-the-uio-device-to-be-opened4
-rw-r--r--patches.drivers/qla2xxx-8.03.01.03.11.1-k8-update8
-rw-r--r--patches.fixes/ipr-strstrip-retval-fix52
-rw-r--r--patches.suse/dm-mpath-leastpending-select-path-fix31
-rw-r--r--series.conf2
6 files changed, 99 insertions, 10 deletions
diff --git a/kernel-source.changes b/kernel-source.changes
index 8420973101..63366ee0d1 100644
--- a/kernel-source.changes
+++ b/kernel-source.changes
@@ -1,4 +1,16 @@
-------------------------------------------------------------------
+Mon Apr 12 12:30:41 CEST 2010 - hare@suse.de
+
+- patches.drivers/cnic-give-a-chance-for-the-uio-device-to-be-opened:
+ Fixup compilation warnings.
+- patches.drivers/qla2xxx-8.03.01.03.11.1-k8-update: Fixup compilation
+ warnings.
+- patches.fixes/ipr-strstrip-retval-fix: Fixup compilation
+ warnings in ipr.
+- patches.suse/dm-mpath-leastpending-select-path-fix: Compile
+ warning in dm-least-pending.
+
+-------------------------------------------------------------------
Mon Apr 12 12:15:11 CEST 2010 - mszeredi@suse.cz
- patches.fixes/mempolicy-fix-get_mempolicy-for-relative-and-static-nodes.patch:
diff --git a/patches.drivers/cnic-give-a-chance-for-the-uio-device-to-be-opened b/patches.drivers/cnic-give-a-chance-for-the-uio-device-to-be-opened
index 142394b8c7..ddf0f024a6 100644
--- a/patches.drivers/cnic-give-a-chance-for-the-uio-device-to-be-opened
+++ b/patches.drivers/cnic-give-a-chance-for-the-uio-device-to-be-opened
@@ -38,8 +38,8 @@ index 9781942..897f171 100644
+ }
+
+ if (cp->uio_dev == -1) {
-+ printk(KERN_WARNING PFX, "%s: no uio dev to send nl request\n",
-+ cp->dev->netdev);
++ printk(KERN_WARNING PFX "%s: no uio dev to send nl request\n",
++ cp->dev->netdev->name);
return -ENODEV;
+ }
diff --git a/patches.drivers/qla2xxx-8.03.01.03.11.1-k8-update b/patches.drivers/qla2xxx-8.03.01.03.11.1-k8-update
index eaa48e1f6e..8a6b708bc6 100644
--- a/patches.drivers/qla2xxx-8.03.01.03.11.1-k8-update
+++ b/patches.drivers/qla2xxx-8.03.01.03.11.1-k8-update
@@ -867,14 +867,6 @@ Acked-by: Hannes Reinecke <hare@suse.de>
break;
}
if (lscsi_status != SS_CHECK_CONDITION)
-@@ -2112,6 +2020,7 @@ qla24xx_msix_rsp_q(int irq, void *dev_id
- struct rsp_que *rsp;
- struct device_reg_24xx __iomem *reg;
- struct scsi_qla_host *vha;
-+ unsigned long flags;
-
- rsp = (struct rsp_que *) dev_id;
- if (!rsp) {
@@ -2141,6 +2050,7 @@ qla25xx_msix_rsp_q(int irq, void *dev_id
struct qla_hw_data *ha;
struct rsp_que *rsp;
diff --git a/patches.fixes/ipr-strstrip-retval-fix b/patches.fixes/ipr-strstrip-retval-fix
new file mode 100644
index 0000000000..9b2eeacdce
--- /dev/null
+++ b/patches.fixes/ipr-strstrip-retval-fix
@@ -0,0 +1,52 @@
+From: Hannes Reinecke <hare@suse.de>
+Subject: Fixup compilation warnings in ipr
+Patch-Mainline: Not yet
+
+During kernel compilation the following warnings are issued:
+/usr/src/packages/BUILD/kernel-default-2.6.32.11/linux-2.6.32/drivers/scsi/ipr.c
+: In function 'ipr_log_enhanced_dual_ioa_error':
+/usr/src/packages/BUILD/kernel-default-2.6.32.11/linux-2.6.32/drivers/scsi/ipr.c
+:1336: warning: ignoring return value of 'strstrip', declared with attribute warn_unused_result
+/usr/src/packages/BUILD/kernel-default-2.6.32.11/linux-2.6.32/drivers/scsi/ipr.c
+: In function 'ipr_log_dual_ioa_error':
+/usr/src/packages/BUILD/kernel-default-2.6.32.11/linux-2.6.32/drivers/scsi/ipr.c
+:1362: warning: ignoring return value of 'strstrip', declared with attribute warn_unused_result
+
+Signed-off-by: Hannes Reinecke <hare@suse.de>
+
+diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
+index 83a6b92..6c9d5a7 100644
+--- a/drivers/scsi/ipr.c
++++ b/drivers/scsi/ipr.c
+@@ -1330,12 +1330,13 @@ static void ipr_log_enhanced_dual_ioa_error(struct ipr_ioa_cfg *ioa_cfg,
+ struct ipr_hostrcb *hostrcb)
+ {
+ struct ipr_hostrcb_type_17_error *error;
++ char *reason;
+
+ error = &hostrcb->hcam.u.error.u.type_17_error;
+ error->failure_reason[sizeof(error->failure_reason) - 1] = '\0';
+- strstrip(error->failure_reason);
++ reason = strstrip(error->failure_reason);
+
+- ipr_hcam_err(hostrcb, "%s [PRC: %08X]\n", error->failure_reason,
++ ipr_hcam_err(hostrcb, "%s [PRC: %08X]\n", reason,
+ be32_to_cpu(hostrcb->hcam.u.error.prc));
+ ipr_log_ext_vpd_compact("Remote IOA", hostrcb, &error->vpd);
+ ipr_log_hex_data(ioa_cfg, error->data,
+@@ -1356,12 +1357,13 @@ static void ipr_log_dual_ioa_error(struct ipr_ioa_cfg *ioa_cfg,
+ struct ipr_hostrcb *hostrcb)
+ {
+ struct ipr_hostrcb_type_07_error *error;
++ char *reason;
+
+ error = &hostrcb->hcam.u.error.u.type_07_error;
+ error->failure_reason[sizeof(error->failure_reason) - 1] = '\0';
+- strstrip(error->failure_reason);
++ reason = strstrip(error->failure_reason);
+
+- ipr_hcam_err(hostrcb, "%s [PRC: %08X]\n", error->failure_reason,
++ ipr_hcam_err(hostrcb, "%s [PRC: %08X]\n", reason,
+ be32_to_cpu(hostrcb->hcam.u.error.prc));
+ ipr_log_vpd_compact("Remote IOA", hostrcb, &error->vpd);
+ ipr_log_hex_data(ioa_cfg, error->data,
diff --git a/patches.suse/dm-mpath-leastpending-select-path-fix b/patches.suse/dm-mpath-leastpending-select-path-fix
new file mode 100644
index 0000000000..6c1a32d5e3
--- /dev/null
+++ b/patches.suse/dm-mpath-leastpending-select-path-fix
@@ -0,0 +1,31 @@
+From: Hannes Reinecke <hare@suse.de
+Subject: Compile warning in dm-least-pending
+Patch-Mainline: No
+
+Bitrot has set in in dm-least-pending. Fix it up.
+
+Signed-off-by: Hannes Reinecke <hare@suse.de>
+
+diff --git a/drivers/md/dm-least-pending.c b/drivers/md/dm-least-pending.c
+index 76659ca..279bfdf 100644
+--- a/drivers/md/dm-least-pending.c
++++ b/drivers/md/dm-least-pending.c
+@@ -172,7 +172,7 @@ static int lpp_reinstate_path(struct path_selector *ps, struct dm_path *p)
+ }
+
+ static struct dm_path *lpp_select_path(struct path_selector *ps,
+- unsigned *repeat_count)
++ unsigned *repeat_count, size_t nr_bytes)
+ {
+ struct selector *s = ps->context;
+ struct path_info *pi, *next, *least_io_path = NULL;
+@@ -199,7 +199,8 @@ static struct dm_path *lpp_select_path(struct path_selector *ps,
+ return least_io_path->path;
+ }
+
+-static int lpp_end_io(struct path_selector *ps, struct dm_path *path)
++static int lpp_end_io(struct path_selector *ps, struct dm_path *path,
++ size_t nr_bytes)
+ {
+ struct path_info *pi = NULL;
+
diff --git a/series.conf b/series.conf
index 362ab04225..25d6a95fc9 100644
--- a/series.conf
+++ b/series.conf
@@ -1056,6 +1056,7 @@
patches.drivers/scsi-transport-sas-enable-tlr
patches.fixes/scsi-fixup-vpd-page-allocation
patches.fixes/fc-transport-make-sure-cmds-are-completed-for-offlined-rport
+ patches.fixes/ipr-strstrip-retval-fix
# Remaining SCSI patches (garloff)
patches.suse/scsi-error-test-unit-ready-timeout
@@ -1661,6 +1662,7 @@
patches.fixes/dm-mpath-simplify-rq-based-suspend
patches.fixes/dm-mpath-requeue-stall
patches.fixes/dm-mpath-trace-rq-based-remapping
+ patches.suse/dm-mpath-leastpending-select-path-fix
########################################################
# md