From f66ca1b1ebe2aea2babbe7b1ba25d47373363e1b Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Sat, 20 Jun 2020 04:07:23 +0000 Subject: [PATCH] Use the more descriptive src_ccb and dst_ccb for the two ccbs being merged. MFC after: 1 week --- sys/cam/cam_xpt.c | 18 +++++++++--------- sys/cam/cam_xpt.h | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c index cb837302208e..e8fec4a325f4 100644 --- a/sys/cam/cam_xpt.c +++ b/sys/cam/cam_xpt.c @@ -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)); } diff --git a/sys/cam/cam_xpt.h b/sys/cam/cam_xpt.h index 250db1ea7448..4fc1d7231918 100644 --- a/sys/cam/cam_xpt.h +++ b/sys/cam/cam_xpt.h @@ -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,