src/patches/suse-2.6.27.25/patches.arch/s390-07-01-zfcp-port-failed-message.diff

   1 From: Gerald Schaefer <geraldsc@de.ibm.com>
   2 Subject: zfcp: Remove message for failed port
   3 References: bnc#464466
   4
   5 Symptom:     During opening of an adapter the message "Remote port ...
   6              could not be opened" is emitted for initiator ports,
   7              confusing users.
   8 Problem:     The port scan tries to open all ports, including
   9              initiator ports to determine if they are target ports.
  10              Sometimes, a different error status is returned for the
  11              initiator ports, triggering the message mentioned above.
  12 Solution:    Remove the message, target port failures will be checked
  13              later in the error recovery, printing a different message
  14              if necessary.
  15
  16 Acked-by: John Jolly <jjolly@suse.de>
  17 ---
  18  Documentation/kmsg/s390/zfcp |   15 ---------------
  19  drivers/s390/scsi/zfcp_dbf.c |    2 +-
  20  drivers/s390/scsi/zfcp_fsf.c |    6 ------
  21  3 files changed, 1 insertion(+), 22 deletions(-)
  22
  23 --- a/Documentation/kmsg/s390/zfcp      2008-12-19 13:18:45.000000000 +0100
  24 +++ b/Documentation/kmsg/s390/zfcp      2008-12-19 13:18:59.000000000 +0100
  25 @@ -677,21 +677,6 @@
  26   */
  27
  28  /*?
  29 - * Text: "%s: Remote port 0x%016Lx could not be opened\n"
  30 - * Severity: Warning
  31 - * Parameter:
  32 - *   @1: bus ID of the zfcp device
  33 - *   @2: WWPN
  34 - * Description:
  35 - * The FCP adapter rejected a request to open the specified port. No retry
  36 - * is possible.
  37 - * User action:
  38 - * Verify the setup and try removing and adding the port again. If this
  39 - * problem persists, gather Linux debug data, collect the FCP adapter
  40 - * hardware logs, and report the problem to your support organization.
  41 - */
  42 -
  43 -/*?
  44   * Text: "%s: LUN 0x%Lx on port 0x%Lx is already in use by CSS%d, MIF Image ID %x\n"
  45   * Severity: Warning
  46   * Parameter:
  47 --- a/drivers/s390/scsi/zfcp_dbf.c      2008-12-19 13:18:45.000000000 +0100
  48 +++ b/drivers/s390/scsi/zfcp_dbf.c      2008-12-19 13:18:59.000000000 +0100
  49 @@ -521,7 +521,7 @@ static const char *zfcp_rec_dbf_ids[] =
  50         [29]    = "link down",
  51         [30]    = "link up status read",
  52         [31]    = "open port failed",
  53 -       [32]    = "open port failed",
  54 +       [32]    = "",
  55         [33]    = "close port",
  56         [34]    = "open unit failed",
  57         [35]    = "exclusive open unit failed",
  58 --- a/drivers/s390/scsi/zfcp_fsf.c      2008-12-19 13:18:45.000000000 +0100
  59 +++ b/drivers/s390/scsi/zfcp_fsf.c      2008-12-19 13:18:59.000000000 +0100
  60 @@ -1405,13 +1405,7 @@ static void zfcp_fsf_open_port_handler(s
  61                 switch (header->fsf_status_qual.word[0]) {
  62                 case FSF_SQ_INVOKE_LINK_TEST_PROCEDURE:
  63                 case FSF_SQ_ULP_DEPENDENT_ERP_REQUIRED:
  64 -                       req->status |= ZFCP_STATUS_FSFREQ_ERROR;
  65 -                       break;
  66                 case FSF_SQ_NO_RETRY_POSSIBLE:
  67 -                       dev_warn(&req->adapter->ccw_device->dev,
  68 -                                "Remote port 0x%016Lx could not be opened\n",
  69 -                                (unsigned long long)port->wwpn);
  70 -                       zfcp_erp_port_failed(port, 32, req);
  71                         req->status |= ZFCP_STATUS_FSFREQ_ERROR;
  72                         break;
  73                 }