From owner-svn-src-all@FreeBSD.ORG  Wed Jun 10 13:04:08 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1C698106566B;
	Wed, 10 Jun 2009 13:04:08 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0A6C28FC0C;
	Wed, 10 Jun 2009 13:04:08 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5AD479H013988;
	Wed, 10 Jun 2009 13:04:07 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5AD47T1013987;
	Wed, 10 Jun 2009 13:04:07 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <200906101304.n5AD47T1013987@svn.freebsd.org>
From: Dag-Erling Smorgrav <des@FreeBSD.org>
Date: Wed, 10 Jun 2009 13:04:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193912 - stable/7/sbin/clri
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Jun 2009 13:04:08 -0000

Author: des
Date: Wed Jun 10 13:04:07 2009
New Revision: 193912
URL: http://svn.freebsd.org/changeset/base/193912

Log:
  merge r173764: fix aliasing violations.

Modified:
  stable/7/sbin/clri/   (props changed)
  stable/7/sbin/clri/clri.c

Modified: stable/7/sbin/clri/clri.c
==============================================================================
--- stable/7/sbin/clri/clri.c	Wed Jun 10 12:54:36 2009	(r193911)
+++ stable/7/sbin/clri/clri.c	Wed Jun 10 13:04:07 2009	(r193912)
@@ -81,6 +81,7 @@ main(int argc, char *argv[])
 	off_t offset;
 	int i, fd, inonum;
 	char *fs, sblock[SBLOCKSIZE];
+	void *v = ibuf;
 
 	if (argc < 3)
 		usage();
@@ -128,7 +129,7 @@ main(int argc, char *argv[])
 
 		if (sbp->fs_magic == FS_UFS2_MAGIC) {
 			/* get the inode within the block. */
-			dp2 = &(((struct ufs2_dinode *)ibuf)
+			dp2 = &(((struct ufs2_dinode *)v)
 			    [ino_to_fsbo(sbp, inonum)]);
 
 			/* clear the inode, and bump the generation count. */
@@ -137,7 +138,7 @@ main(int argc, char *argv[])
 			dp2->di_gen = generation;
 		} else {
 			/* get the inode within the block. */
-			dp1 = &(((struct ufs1_dinode *)ibuf)
+			dp1 = &(((struct ufs1_dinode *)v)
 			    [ino_to_fsbo(sbp, inonum)]);
 
 			/* clear the inode, and bump the generation count. */