2 files changed, 7 insertions, 5 deletions

diff --git a/drivers/s390/scsi/zfcp_erp.c b/drivers/s390/scsi/zfcp_erp.c
index 421da1e7c0ea..c1f2d4b14c2b 100644
--- a/drivers/s390/scsi/zfcp_erp.c
+++ b/drivers/s390/scsi/zfcp_erp.c
@@ -186,7 +186,7 @@ void zfcp_fsf_start_timer(struct zfcp_fsf_req *fsf_req, unsigned long timeout)
 {
         fsf_req->timer.function = zfcp_fsf_request_timeout_handler;
         fsf_req->timer.data = (unsigned long) fsf_req->adapter;
-        fsf_req->timer.expires = timeout;
+        fsf_req->timer.expires = jiffies + timeout;
         add_timer(&fsf_req->timer);
 }
 
diff --git a/drivers/s390/scsi/zfcp_fsf.c b/drivers/s390/scsi/zfcp_fsf.c
index ef16f7ca4bb1..4c0a59afd5c8 100644
--- a/drivers/s390/scsi/zfcp_fsf.c
+++ b/drivers/s390/scsi/zfcp_fsf.c
@@ -299,9 +299,10 @@ zfcp_fsf_protstatus_eval(struct zfcp_fsf_req *fsf_req)
         }
 
         /* log additional information provided by FSF (if any) */
-        if (unlikely(qtcb->header.log_length)) {
+        if (likely(qtcb->header.log_length)) {
                 /* do not trust them ;-) */
-                if (qtcb->header.log_start > sizeof(struct fsf_qtcb)) {
+                if (unlikely(qtcb->header.log_start >
+                             sizeof(struct fsf_qtcb))) {
                         ZFCP_LOG_NORMAL
                             ("bug: ULP (FSF logging) log data starts "
                              "beyond end of packet header. Ignored. "
@@ -310,8 +311,9 @@ zfcp_fsf_protstatus_eval(struct zfcp_fsf_req *fsf_req)
                              sizeof(struct fsf_qtcb));
                         goto forget_log;
                 }
-                if ((size_t) (qtcb->header.log_start + qtcb->header.log_length)
-                    > sizeof(struct fsf_qtcb)) {
+                if (unlikely((size_t) (qtcb->header.log_start +
+                                       qtcb->header.log_length) >
+                             sizeof(struct fsf_qtcb))) {
                         ZFCP_LOG_NORMAL("bug: ULP (FSF logging) log data ends "
                                         "beyond end of packet header. Ignored. "
                                         "(start=%i, length=%i, size=%li)\n",