From owner-svn-src-all@freebsd.org Sat Jan 27 07:18:03 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 14313E64F24; Sat, 27 Jan 2018 07:18:03 +0000 (UTC) (envelope-from scottl@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AC8F67A39B; Sat, 27 Jan 2018 07:18:02 +0000 (UTC) (envelope-from scottl@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A1E3F272A7; Sat, 27 Jan 2018 07:18:02 +0000 (UTC) (envelope-from scottl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0R7I2on006482; Sat, 27 Jan 2018 07:18:02 GMT (envelope-from scottl@FreeBSD.org) Received: (from scottl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0R7I2Gv006481; Sat, 27 Jan 2018 07:18:02 GMT (envelope-from scottl@FreeBSD.org) Message-Id: <201801270718.w0R7I2Gv006481@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: scottl set sender to scottl@FreeBSD.org using -f From: Scott Long Date: Sat, 27 Jan 2018 07:18:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r328464 - head/sys/cam/scsi X-SVN-Group: head X-SVN-Commit-Author: scottl X-SVN-Commit-Paths: head/sys/cam/scsi X-SVN-Commit-Revision: 328464 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Jan 2018 07:18:03 -0000 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)