Home Home > GIT Browse > openSUSE-42.3
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Mahoney <jeffm@suse.com>2018-11-20 21:17:15 -0500
committerMichal Koutný <mkoutny@suse.com>2019-01-14 19:22:08 +0100
commit119a27d3a6fd637662278eaf0cb553c213205539 (patch)
tree27e88ffe3ac4ad864b23fa62abadbada80743892
parentd9fd526e3c3c7cbbca7006db0d7b2888bbc98e5b (diff)
libfc: sync strings with upstream versions (bsc#1114763).
Also remove the space after sizeof. Refreshed patches.drivers/0004-scsi-libfc-use-error-code-for-fc_rport_error.patch. Refreshed patches.drivers/0007-scsi-libfc-Check-xid-when-looking-up-REC-exchanges.patch. Refreshed patches.fixes/libfc-additional-debugging-messages.patch. Refreshed patches.fixes/libfc-frame-alloc-failure-messages.patch. Refreshed patches.fixes/libfc-spurious-I-O-error-under-high-load.patch. Refreshed patches.fixes/libfc-use-error-code-for-fc_rport_error.patch.
-rw-r--r--patches.fixes/libfc-additional-debugging-messages.patch25
-rw-r--r--patches.fixes/libfc-frame-alloc-failure-messages.patch4
-rw-r--r--patches.fixes/libfc-spurious-I-O-error-under-high-load.patch6
-rw-r--r--patches.fixes/libfc-use-error-code-for-fc_rport_error.patch6
4 files changed, 25 insertions, 16 deletions
diff --git a/patches.fixes/libfc-additional-debugging-messages.patch b/patches.fixes/libfc-additional-debugging-messages.patch
index 692bf76de7..3e46013b78 100644
--- a/patches.fixes/libfc-additional-debugging-messages.patch
+++ b/patches.fixes/libfc-additional-debugging-messages.patch
@@ -128,15 +128,14 @@ index 5121272..bd4bdbf 100644
fc_fcp_timer_set(fsp, 2);
return;
}
-@@ -959,8 +968,12 @@ static void fc_fcp_complete_locked(struct fc_fcp_pkt *fsp)
+@@ -959,8 +968,11 @@ static void fc_fcp_complete_locked(struct fc_fcp_pkt *fsp)
if (fsp->cdb_status == SAM_STAT_GOOD &&
fsp->xfer_len < fsp->data_len && !fsp->io_status &&
(!(fsp->scsi_comp_flags & FCP_RESID_UNDER) ||
- fsp->xfer_len < fsp->data_len - fsp->scsi_resid))
+ fsp->xfer_len < fsp->data_len - fsp->scsi_resid)) {
-+ FC_FCP_DBG( fsp, "data underrun, "
-+ "xfer_len %zx data_len %x\n",
-+ fsp->xfer_len, fsp->data_len );
++ FC_FCP_DBG(fsp, "data underrun, xfer %zx data %x\n",
++ fsp->xfer_len, fsp->data_len);
fsp->status_code = FC_DATA_UNDRUN;
+ }
}
@@ -164,12 +163,22 @@ index 5121272..bd4bdbf 100644
fsp->state |= FC_SRB_FCP_PROCESSING_TMO;
if (rpriv->flags & FC_RP_FLAGS_REC_SUPPORTED)
-@@ -1503,6 +1521,10 @@ static void fc_fcp_rec_resp(struct fc_seq *seq, struct fc_frame *fp, void *arg)
+@@ -1486,8 +1503,8 @@ static void fc_fcp_rec_resp(struct fc_seq *seq, struct fc_frame *fp, void *arg)
+ rjt = fc_frame_payload_get(fp, sizeof(*rjt));
+ switch (rjt->er_reason) {
+ default:
+- FC_FCP_DBG(fsp, "device %x unexpected REC reject "
+- "reason %d expl %d\n",
++ FC_FCP_DBG(fsp,
++ "device %x invalid REC reject %d/%d\n",
+ fsp->rport->port_id, rjt->er_reason,
+ rjt->er_explan);
+ /* fall through */
+@@ -1503,6 +1521,9 @@ static void fc_fcp_rec_resp(struct fc_seq *seq, struct fc_frame *fp, void *arg)
break;
case ELS_RJT_LOGIC:
case ELS_RJT_UNAB:
-+ FC_FCP_DBG(fsp, "device %x REC reject "
-+ "reason %d expl %d\n",
++ FC_FCP_DBG(fsp, "device %x REC reject %d/%d\n"
+ fsp->rport->port_id, rjt->er_reason,
+ rjt->er_explan);
/*
@@ -248,7 +257,7 @@ index 6a98bb8..afc1f9b 100644
} else {
- FC_RPORT_DBG(rdata, "Bad ELS response for PRLI command\n");
- fc_rport_error_retry(rdata, fp);
-+ rjt = fc_frame_payload_get(fp, sizeof (*rjt));
++ rjt = fc_frame_payload_get(fp, sizeof(*rjt));
+ FC_RPORT_DBG(rdata, "PRLI ELS rejected, reason %x expl %x\n",
+ rjt->er_reason, rjt->er_explan);
+ fc_rport_error_retry(rdata, NULL);
diff --git a/patches.fixes/libfc-frame-alloc-failure-messages.patch b/patches.fixes/libfc-frame-alloc-failure-messages.patch
index 17284f93a3..cc94f1123d 100644
--- a/patches.fixes/libfc-frame-alloc-failure-messages.patch
+++ b/patches.fixes/libfc-frame-alloc-failure-messages.patch
@@ -106,8 +106,8 @@ index 51e7fb1..26a43b3 100644
explan = ELS_EXPL_OXID_RXID;
- if (!ep)
+ if (!ep) {
-+ FC_LPORT_DBG(lport, "REC request from %x: "
-+ "xid %4.4x-%4.4x not found\n",
++ FC_LPORT_DBG(lport,
++ "REC request from %x: xid %4.4x-%4.4x not found\n",
+ sid, rxid, oxid);
goto reject;
+ }
diff --git a/patches.fixes/libfc-spurious-I-O-error-under-high-load.patch b/patches.fixes/libfc-spurious-I-O-error-under-high-load.patch
index 04b7659f83..eb93b16d62 100644
--- a/patches.fixes/libfc-spurious-I-O-error-under-high-load.patch
+++ b/patches.fixes/libfc-spurious-I-O-error-under-high-load.patch
@@ -61,11 +61,11 @@ index bd4bdbf..289c481 100644
}
@@ -1522,9 +1523,9 @@ static void fc_fcp_rec_resp(struct fc_seq *seq, struct fc_frame *fp, void *arg)
+ break;
case ELS_RJT_LOGIC:
case ELS_RJT_UNAB:
- FC_FCP_DBG(fsp, "device %x REC reject "
-- "reason %d expl %d\n",
-+ "reason %x expl %x xfer_len %zx\n",
+- FC_FCP_DBG(fsp, "device %x REC reject %d/%d\n"
++ FC_FCP_DBG(fsp, "device %x REC reject %d/%d xfer_len %zx\n",
fsp->rport->port_id, rjt->er_reason,
- rjt->er_explan);
+ rjt->er_explan, fsp->xfer_len);
diff --git a/patches.fixes/libfc-use-error-code-for-fc_rport_error.patch b/patches.fixes/libfc-use-error-code-for-fc_rport_error.patch
index 33ea5e47f8..1c0db12175 100644
--- a/patches.fixes/libfc-use-error-code-for-fc_rport_error.patch
+++ b/patches.fixes/libfc-use-error-code-for-fc_rport_error.patch
@@ -126,7 +126,7 @@ index 8fad3e9..ec608ef 100644
+ if (fc_frame_payload_op(fp) != ELS_LS_ACC) {
+ struct fc_els_ls_rjt *rjt;
+
-+ rjt = fc_frame_payload_get(fp, sizeof (*rjt));
++ rjt = fc_frame_payload_get(fp, sizeof(*rjt));
+ FC_RPORT_DBG(rdata, "FLOGI ELS rejected, reason %x expl %x\n",
+ rjt->er_reason, rjt->er_explan);
+ err = -FC_EX_ELS_RJT;
@@ -191,7 +191,7 @@ index 8fad3e9..ec608ef 100644
+ } else {
+ struct fc_els_ls_rjt *rjt;
-+ rjt = fc_frame_payload_get(fp, sizeof (*rjt));
++ rjt = fc_frame_payload_get(fp, sizeof(*rjt));
+ FC_RPORT_DBG(rdata, "PLOGI ELS rejected, reason %x expl %x\n",
+ rjt->er_reason, rjt->er_explan);
+ fc_rport_error_retry(rdata, -FC_EX_ELS_RJT);
@@ -239,7 +239,7 @@ index 8fad3e9..ec608ef 100644
}
if (pp->prli.prli_spp_len < sizeof(pp->spp))
@@ -1133,7 +1150,7 @@ static void fc_rport_prli_resp(struct fc_seq *sp, struct fc_frame *fp,
- rjt = fc_frame_payload_get(fp, sizeof (*rjt));
+ rjt = fc_frame_payload_get(fp, sizeof(*rjt));
FC_RPORT_DBG(rdata, "PRLI ELS rejected, reason %x expl %x\n",
rjt->er_reason, rjt->er_explan);
- fc_rport_error_retry(rdata, NULL);