From owner-svn-src-stable-8@FreeBSD.ORG  Tue Jun  1 13:57:59 2010
Return-Path: <owner-svn-src-stable-8@FreeBSD.ORG>
Delivered-To: svn-src-stable-8@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 017C2106567D;
	Tue,  1 Jun 2010 13:57:59 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E47768FC1E;
	Tue,  1 Jun 2010 13:57:58 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o51DvwKe049732;
	Tue, 1 Jun 2010 13:57:58 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o51DvwQ6049731;
	Tue, 1 Jun 2010 13:57:58 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <201006011357.o51DvwQ6049731@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Tue, 1 Jun 2010 13:57:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r208691 - stable/8/sys/fs/coda
X-BeenThere: svn-src-stable-8@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 8-stable src tree
	<svn-src-stable-8.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-8>
List-Post: <mailto:svn-src-stable-8@freebsd.org>
List-Help: <mailto:svn-src-stable-8-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 01 Jun 2010 13:57:59 -0000

Author: rwatson
Date: Tue Jun  1 13:57:58 2010
New Revision: 208691
URL: http://svn.freebsd.org/changeset/base/208691

Log:
  Merge r206206 from head to stable/8:
  
    Correct definition of CIOC_KERNEL_VERSION Coda ioctl() for systems
    where sizeof(int) != sizeof(sizeof(int)), or the ioctl will return
    EINVAL.
  
  Approved by:	re (kib)

Modified:
  stable/8/sys/fs/coda/coda.h
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)
  stable/8/sys/geom/sched/   (props changed)

Modified: stable/8/sys/fs/coda/coda.h
==============================================================================
--- stable/8/sys/fs/coda/coda.h	Tue Jun  1 09:32:22 2010	(r208690)
+++ stable/8/sys/fs/coda/coda.h	Tue Jun  1 13:57:58 2010	(r208691)
@@ -313,7 +313,7 @@ struct coda_statfs {
 #define VC_MAXMSGSIZE      sizeof(union inputArgs)+sizeof(union outputArgs) +\
                             VC_MAXDATASIZE  
 
-#define CIOC_KERNEL_VERSION _IOWR('c', 10, sizeof (int))
+#define CIOC_KERNEL_VERSION _IOWR('c', 10, int)
 #if	0
 	/* don't care about kernel version number */
 #define CODA_KERNEL_VERSION 0