svn commit: r208691 - stable/8/sys/fs/coda

[Robert Watson]

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