[Open-FCoE] [PATCH 19/28] libfc: rename fcdt_ns_retry/error to fc_ns_retry/error

Robert Love robert.w.love at intel.com
Tue Sep 30 18:26:29 UTC 2008


Previous patches moved some of the retry/error handling
functions to other files. Previously there were naming
conflicts for different retry/error functions within
fc_ns.c. Now that there is only one function for
discovery's retry/error routines we can name them
appropriately.

Signed-off-by: Robert Love <robert.w.love at intel.com>
---

 drivers/scsi/libfc/fc_ns.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/scsi/libfc/fc_ns.c b/drivers/scsi/libfc/fc_ns.c
index 39948cc..7376d5d 100644
--- a/drivers/scsi/libfc/fc_ns.c
+++ b/drivers/scsi/libfc/fc_ns.c
@@ -41,7 +41,7 @@ static int fc_ns_new_target(struct fc_lport *, struct fc_rport *,
 			    struct fc_rport_identifiers *);
 static void fc_ns_del_target(struct fc_lport *, struct fc_rport *);
 static void fc_ns_disc_done(struct fc_lport *);
-static void fcdt_ns_error(struct fc_lport *, struct fc_frame *);
+static void fc_ns_error(struct fc_lport *, struct fc_frame *);
 static void fc_ns_timeout(struct work_struct *);
 static void fc_ns_single(struct fc_lport *, struct fc_ns_port *);
 static int fc_ns_restart(struct fc_lport *);
@@ -223,7 +223,7 @@ int fc_ns_disc_start(struct fc_lport *lp)
  * Restart discovery after a delay due to resource shortages.
  * If the error persists, the discovery will be abandoned.
  */
-static void fcdt_ns_retry(struct fc_lport *lp)
+static void fc_ns_retry(struct fc_lport *lp)
 {
 	unsigned long delay = FC_NS_RETRY_DELAY;
 
@@ -346,13 +346,13 @@ static void fc_ns_gpn_ft_req(struct fc_lport *lp)
 					  FC_FC_SEQ_INIT | FC_FC_END_SEQ);
 	}
 	if (error || sp == NULL)
-		fcdt_ns_retry(lp);
+		fc_ns_retry(lp);
 }
 
 /*
  * Handle error on dNS request.
  */
-static void fcdt_ns_error(struct fc_lport *lp, struct fc_frame *fp)
+static void fc_ns_error(struct fc_lport *lp, struct fc_frame *fp)
 {
 	int err = PTR_ERR(fp);
 
@@ -504,7 +504,7 @@ static void fc_ns_gpn_ft_resp(struct fc_seq *sp, struct fc_frame *fp,
 	int error;
 
 	if (IS_ERR(fp)) {
-		fcdt_ns_error(lp, fp);
+		fc_ns_error(lp, fp);
 		return;
 	}
 
@@ -545,7 +545,7 @@ static void fc_ns_gpn_ft_resp(struct fc_seq *sp, struct fc_frame *fp,
 	if (buf) {
 		error = fc_ns_gpn_ft_parse(lp, buf, len);
 		if (error)
-			fcdt_ns_retry(lp);
+			fc_ns_retry(lp);
 		else
 			lp->ns_disc_seq_count++;
 	}




More information about the devel mailing list