svn commit: r328464 - head/sys/cam/scsi

Scott Long scottl at FreeBSD.org
Sat Jan 27 07:18:03 UTC 2018


Author: scottl
Date: Sat Jan 27 07:18:02 2018
New Revision: 328464
URL: https://svnweb.freebsd.org/changeset/base/328464

Log:
  Finish the incomplete move of CAM_PERIPH_PRINT().
  
  Reported by:	kevans

Modified:
  head/sys/cam/scsi/scsi_da.c

Modified: head/sys/cam/scsi/scsi_da.c
==============================================================================
--- head/sys/cam/scsi/scsi_da.c	Sat Jan 27 06:31:14 2018	(r328463)
+++ head/sys/cam/scsi/scsi_da.c	Sat Jan 27 07:18:02 2018	(r328464)
@@ -1510,8 +1510,10 @@ static const char *da_ref_text[] = {
 	"max -- also bogus"
 };
 
+#define DA_PERIPH_PRINT(periph, msg, args...)		\
+	CAM_PERIPH_PRINT(periph, msg, ##args)
 #else
-#define CAM_PERIPH_PRINT(p, msg, args...)
+#define DA_PERIPH_PRINT(periph, msg, args...)
 #endif
 
 static inline void
@@ -1527,7 +1529,7 @@ da_periph_hold(struct cam_periph *periph, int priority
 	int err = cam_periph_hold(periph, priority);
 
 	token_sanity(token);
-	CAM_PERIPH_PRINT(periph, "Holding device %s (%d): %d\n",
+	DA_PERIPH_PRINT(periph, "Holding device %s (%d): %d\n",
 	    da_ref_text[token], token, err);
 	if (err == 0) {
 		int cnt;
@@ -1548,7 +1550,7 @@ da_periph_unhold(struct cam_periph *periph, da_ref_tok
 
 	token_sanity(token);
 	cam_periph_unhold(periph);
-	CAM_PERIPH_PRINT(periph, "Unholding device %s (%d)\n",
+	DA_PERIPH_PRINT(periph, "Unholding device %s (%d)\n",
 	    da_ref_text[token], token);
 	cnt = atomic_fetchadd_int(&softc->ref_flags[token], -1);
 	if (cnt != 1)
@@ -1561,7 +1563,7 @@ da_periph_acquire(struct cam_periph *periph, da_ref_to
 	int err = cam_periph_acquire(periph);
 
 	token_sanity(token);
-	CAM_PERIPH_PRINT(periph, "acquiring device %s (%d): %d\n",
+	DA_PERIPH_PRINT(periph, "acquiring device %s (%d): %d\n",
 	    da_ref_text[token], token, err);
 	if (err == CAM_REQ_CMP) {
 		int cnt;
@@ -1582,7 +1584,7 @@ da_periph_release(struct cam_periph *periph, da_ref_to
 
 	token_sanity(token);
 	cam_periph_release(periph);
-	CAM_PERIPH_PRINT(periph, "releasing device %s (%d)\n",
+	DA_PERIPH_PRINT(periph, "releasing device %s (%d)\n",
 	    da_ref_text[token], token);
 	cnt = atomic_fetchadd_int(&softc->ref_flags[token], -1);
 	if (cnt != 1)
@@ -1597,7 +1599,7 @@ da_periph_release_locked(struct cam_periph *periph, da
 
 	token_sanity(token);
 	cam_periph_release_locked(periph);
-	CAM_PERIPH_PRINT(periph, "releasing device (locked) %s (%d)\n",
+	DA_PERIPH_PRINT(periph, "releasing device (locked) %s (%d)\n",
 	    da_ref_text[token], token);
 	cnt = atomic_fetchadd_int(&softc->ref_flags[token], -1);
 	if (cnt != 1)


More information about the svn-src-head mailing list