From owner-freebsd-fs@FreeBSD.ORG  Sun Apr 15 11:08:08 2012
Return-Path: <owner-freebsd-fs@FreeBSD.ORG>
Delivered-To: freebsd-fs@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 1233)
	id 04F8C106566C; Sun, 15 Apr 2012 11:08:08 +0000 (UTC)
Date: Sun, 15 Apr 2012 11:08:08 +0000
From: Alexander Best <arundel@freebsd.org>
To: freebsd-fs@freebsd.org
Message-ID: <20120415110807.GA75306@freebsd.org>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="Dxnq1zWXvFF0Q93v"
Content-Disposition: inline
Subject: fixing a hackish comment in ata-raid.c
X-BeenThere: freebsd-fs@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Filesystems <freebsd-fs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-fs>,
	<mailto:freebsd-fs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-fs>
List-Post: <mailto:freebsd-fs@freebsd.org>
List-Help: <mailto:freebsd-fs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-fs>,
	<mailto:freebsd-fs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 15 Apr 2012 11:08:08 -0000


--Dxnq1zWXvFF0Q93v
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

hi there,

clang complains about this rather ugly way of putting a comment into normal
code:

if ((vdcr == NULL) /* && (sa == NULL) * Spares not supported yet */) {

could somebody please commit the following (or a similar) patch?

thanks in advance.
alex

--Dxnq1zWXvFF0Q93v
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="ata-raid.c.patch"

diff --git a/sys/dev/ata/ata-raid.c b/sys/dev/ata/ata-raid.c
index c96e252..f7215d3 100644
--- a/sys/dev/ata/ata-raid.c
+++ b/sys/dev/ata/ata-raid.c
@@ -1892,7 +1892,12 @@ ata_raid_ddf_read_meta(device_t dev, struct ar_softc **raidp)
 	}
     }
 cr_found:
-    if ((vdcr == NULL) /* && (sa == NULL) * Spares not supported yet */) {
+    /* Spares are not supported yet.
+     * Once support is implemented the condition below should be:
+     *
+     * if ((vdcr == NULL) && (sa == NULL)) {
+     */
+    if (vdcr == NULL) {
 	device_printf(parent, "No usable configuration record found\n");
 	goto ddf_out;
     }

--Dxnq1zWXvFF0Q93v--