From owner-svn-src-head@FreeBSD.ORG  Wed Dec 10 19:45:58 2008
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4BF521065673;
	Wed, 10 Dec 2008 19:45:58 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3C3938FC2B;
	Wed, 10 Dec 2008 19:45:58 +0000 (UTC) (envelope-from jhb@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 mBAJjwsY040854;
	Wed, 10 Dec 2008 19:45:58 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBAJjwn2040853;
	Wed, 10 Dec 2008 19:45:58 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <200812101945.mBAJjwn2040853@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Wed, 10 Dec 2008 19:45:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r185874 - head/sys/sys
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Dec 2008 19:45:58 -0000

Author: jhb
Date: Wed Dec 10 19:45:58 2008
New Revision: 185874
URL: http://svn.freebsd.org/changeset/base/185874

Log:
  Rather than using a char array with explicit assumptions about the layout
  of 'struct osigevent' in 'struct aiocb', use int and void pointer spare
  members that are identical to 'struct osigevent'.
  
  MFC after:	1 month

Modified:
  head/sys/sys/aio.h

Modified: head/sys/sys/aio.h
==============================================================================
--- head/sys/sys/aio.h	Wed Dec 10 19:33:10 2008	(r185873)
+++ head/sys/sys/aio.h	Wed Dec 10 19:45:58 2008	(r185874)
@@ -69,7 +69,8 @@ typedef struct aiocb {
 	off_t	aio_offset;		/* File offset for I/O */
 	volatile void *aio_buf;         /* I/O buffer in process space */
 	size_t	aio_nbytes;		/* Number of bytes for I/O */
-	char 	__spare__[sizeof(int) * 2 + sizeof(void *)]; /* osigevent. */
+	int	__spare__[2];
+	void	*__spare2__;
 	int	aio_lio_opcode;		/* LIO opcode */
 	int	aio_reqprio;		/* Request priority -- ignored */
 	struct	__aiocb_private	_aiocb_private;