[SCSI] libfc: fix: empty zone causes endless discovery retries.

On some switches, an empty zone causes GPN_FT to be rejected
with reason 9 (unable) explanation 7 (FC-4 types not registered),
which causes discovery to be retried endlessly.  Treat this as
just an empty response and consider discovery complete.

Signed-off-by: Joe Eykholt <jeykholt@cisco.com>
Signed-off-by: Robert Love <robert.w.love@intel.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

diff --git a/drivers/scsi/libfc/fc_disc.c b/drivers/scsi/libfc/fc_disc.c
index 844376c1d8dca49e2aabf36f67e08f74b06c85c3..9b8043bdeddbc63484f5b42fcd55328f2c8ba3a5 100644 (file)
--- a/drivers/scsi/libfc/fc_disc.c
+++ b/drivers/scsi/libfc/fc_disc.c
@@ -617,6 +617,9 @@ static void fc_disc_gpn_ft_resp(struct fc_seq *sp, struct fc_frame *fp,
                                    "(check zoning)\n", cp->ct_reason,
                                    cp->ct_explan);
                        event = DISC_EV_FAILED;
+                       if (cp->ct_reason == FC_FS_RJT_UNABL &&
+                           cp->ct_explan == FC_FS_EXP_FTNR)
+                               event = DISC_EV_SUCCESS;
                } else {
                        FC_DISC_DBG(disc, "GPN_FT unexpected response code "
                                    "%x\n", ntohs(cp->ct_cmd));

diff --git a/include/scsi/fc/fc_gs.h b/include/scsi/fc/fc_gs.h
index ffab0272c65aa3a7327b1b5463405336d47a617c..324dd0e3c6225df466c3180e3a13df04f5d30f38 100644 (file)
--- a/include/scsi/fc/fc_gs.h
+++ b/include/scsi/fc/fc_gs.h
@@ -87,6 +87,7 @@ enum fc_ct_explan {
        FC_FS_EXP_PNAM =        0x02,   /* port name not registered */
        FC_FS_EXP_NNAM =        0x03,   /* node name not registered */
        FC_FS_EXP_COS =         0x04,   /* class of service not registered */
+       FC_FS_EXP_FTNR =        0x07,   /* FC-4 types not registered */
        /* definitions not complete */
 };