From owner-svn-src-all@freebsd.org Sat Jun 20 04:07:25 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 25103345172; Sat, 20 Jun 2020 04:07:25 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49phvw3gDqz4Hnq; Sat, 20 Jun 2020 04:07:23 +0000 (UTC) (envelope-from imp@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 B933E25FF7; Sat, 20 Jun 2020 04:07:23 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05K47NNf022415; Sat, 20 Jun 2020 04:07:23 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05K47Npg022413; Sat, 20 Jun 2020 04:07:23 GMT (envelope-from imp@FreeBSD.org) Message-Id: <202006200407.05K47Npg022413@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Sat, 20 Jun 2020 04:07:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r362419 - head/sys/cam X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/sys/cam X-SVN-Commit-Revision: 362419 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.33 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, 20 Jun 2020 04:07:25 -0000 Author: imp Date: Sat Jun 20 04:07:23 2020 New Revision: 362419 URL: https://svnweb.freebsd.org/changeset/base/362419 Log: Use the more descriptive src_ccb and dst_ccb for the two ccbs being merged. MFC after: 1 week Modified: head/sys/cam/cam_xpt.c head/sys/cam/cam_xpt.h Modified: head/sys/cam/cam_xpt.c ============================================================================== --- head/sys/cam/cam_xpt.c Fri Jun 19 23:32:40 2020 (r362418) +++ head/sys/cam/cam_xpt.c Sat Jun 20 04:07:23 2020 (r362419) @@ -3526,22 +3526,22 @@ xpt_run_devq(struct cam_devq *devq) } /* - * This function merges stuff from the slave ccb into the master ccb, while - * keeping important fields in the master ccb constant. + * This function merges stuff from the src ccb into the dst ccb, while keeping + * important fields in the dst ccb constant. */ void -xpt_merge_ccb(union ccb *master_ccb, union ccb *slave_ccb) +xpt_merge_ccb(union ccb *dst_ccb, union ccb *src_ccb) { /* * Pull fields that are valid for peripheral drivers to set - * into the master CCB along with the CCB "payload". + * into the dst CCB along with the CCB "payload". */ - master_ccb->ccb_h.retry_count = slave_ccb->ccb_h.retry_count; - master_ccb->ccb_h.func_code = slave_ccb->ccb_h.func_code; - master_ccb->ccb_h.timeout = slave_ccb->ccb_h.timeout; - master_ccb->ccb_h.flags = slave_ccb->ccb_h.flags; - bcopy(&(&slave_ccb->ccb_h)[1], &(&master_ccb->ccb_h)[1], + dst_ccb->ccb_h.retry_count = src_ccb->ccb_h.retry_count; + dst_ccb->ccb_h.func_code = src_ccb->ccb_h.func_code; + dst_ccb->ccb_h.timeout = src_ccb->ccb_h.timeout; + dst_ccb->ccb_h.flags = src_ccb->ccb_h.flags; + bcopy(&(&src_ccb->ccb_h)[1], &(&dst_ccb->ccb_h)[1], sizeof(union ccb) - sizeof(struct ccb_hdr)); } Modified: head/sys/cam/cam_xpt.h ============================================================================== --- head/sys/cam/cam_xpt.h Fri Jun 19 23:32:40 2020 (r362418) +++ head/sys/cam/cam_xpt.h Sat Jun 20 04:07:23 2020 (r362419) @@ -86,8 +86,8 @@ void xpt_setup_ccb_flags(struct ccb_hdr *ccb_h, void xpt_setup_ccb(struct ccb_hdr *ccb_h, struct cam_path *path, u_int32_t priority); -void xpt_merge_ccb(union ccb *master_ccb, - union ccb *slave_ccb); +void xpt_merge_ccb(union ccb *dst_ccb, + union ccb *src_ccb); cam_status xpt_create_path(struct cam_path **new_path_ptr, struct cam_periph *perph, path_id_t path_id,