Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 5 Jan 2017 11:17:10 +0000 (UTC)
From:      Alexander Motin <mav@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject:   svn commit: r311401 - in stable/10/sys: cam/ctl dev/iscsi
Message-ID:  <201701051117.v05BHAnM044789@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: mav
Date: Thu Jan  5 11:17:09 2017
New Revision: 311401
URL: https://svnweb.freebsd.org/changeset/base/311401

Log:
  MFC r295476 (by trasz):  Remove stray semicolons from the iSCSI code.

Modified:
  stable/10/sys/cam/ctl/ctl.c
  stable/10/sys/dev/iscsi/iscsi.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/cam/ctl/ctl.c
==============================================================================
--- stable/10/sys/cam/ctl/ctl.c	Thu Jan  5 11:16:15 2017	(r311400)
+++ stable/10/sys/cam/ctl/ctl.c	Thu Jan  5 11:17:09 2017	(r311401)
@@ -5699,7 +5699,7 @@ ctl_write_same(struct ctl_scsiio *ctsio)
 	 */
 	if ((byte2 & SWS_NDOB) == 0 &&
 	    (ctsio->io_hdr.flags & CTL_FLAG_ALLOCATED) == 0) {
-		ctsio->kern_data_ptr = malloc(len, M_CTL, M_WAITOK);;
+		ctsio->kern_data_ptr = malloc(len, M_CTL, M_WAITOK);
 		ctsio->kern_data_len = len;
 		ctsio->kern_total_len = len;
 		ctsio->kern_data_resid = 0;
@@ -5747,7 +5747,7 @@ ctl_unmap(struct ctl_scsiio *ctsio)
 	 * malloc it and tell the caller the data buffer is here.
 	 */
 	if ((ctsio->io_hdr.flags & CTL_FLAG_ALLOCATED) == 0) {
-		ctsio->kern_data_ptr = malloc(len, M_CTL, M_WAITOK);;
+		ctsio->kern_data_ptr = malloc(len, M_CTL, M_WAITOK);
 		ctsio->kern_data_len = len;
 		ctsio->kern_total_len = len;
 		ctsio->kern_data_resid = 0;

Modified: stable/10/sys/dev/iscsi/iscsi.h
==============================================================================
--- stable/10/sys/dev/iscsi/iscsi.h	Thu Jan  5 11:16:15 2017	(r311400)
+++ stable/10/sys/dev/iscsi/iscsi.h	Thu Jan  5 11:17:09 2017	(r311401)
@@ -118,7 +118,7 @@ struct iscsi_session {
 	char				is_reason[ISCSI_REASON_LEN];
 
 #ifdef ICL_KERNEL_PROXY
-	struct cv			is_login_cv;;
+	struct cv			is_login_cv;
 	struct icl_pdu			*is_login_pdu;
 #endif
 };

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701051117.v05BHAnM044789>