svn commit: r191896 - in head/sys: amd64/linux32 compat/linux i386/linux kern sys

[Chagin Dmitry]

On Thu, May 07, 2009 at 01:17:56PM -0600, Jamie Gritton wrote:
> Chagin Dmitry wrote:
> > On Thu, May 07, 2009 at 06:36:47PM +0000, Jamie Gritton wrote:
> >> Author: jamie
> >> Date: Thu May  7 18:36:47 2009
> >> New Revision: 191896
> >> URL: http://svn.freebsd.org/changeset/base/191896
> >>
> >> Log:
> >>   Move the per-prison Linux MIB from a private one-off pointer to the new
> >>   OSD-based jail extensions.  This allows the Linux MIB to accessed via
> >>   jail_set and jail_get, and serves as a demonstration of adding jail support
> >>   to a module.
> >>   
> >>   Reviewed by:	dchagin, kib
> >>   Approved by:	bz (mentor)
> >>
> > 
> > 
> > whoops
> > 
> > -Wpointer-arith -Winline -Wcast-qual  -Wundef -Wno-pointer-sign -fformat-extensions -c /work/pub/head/sys/modules/linux/../../compat/linux/linux_mib.c
> > cc1: warnings being treated as errors
> > /work/pub/head/sys/modules/linux/../../compat/linux/linux_mib.c: In function 'linux_prison_check':
> > /work/pub/head/sys/modules/linux/../../compat/linux/linux_mib.c:232: warning: passing argument 4 of 'vfs_getopt' from incompatible pointer type
> > /work/pub/head/sys/modules/linux/../../compat/linux/linux_mib.c:243: warning: passing argument 4 of 'vfs_getopt' from incompatible pointer type
> > /work/pub/head/sys/modules/linux/../../compat/linux/linux_mib.c: In function 'linux_prison_set':
> > /work/pub/head/sys/modules/linux/../../compat/linux/linux_mib.c:272: warning: passing argument 4 of 'vfs_getopt' from incompatible pointer type
> > /work/pub/head/sys/modules/linux/../../compat/linux/linux_mib.c:277: warning: passing argument 4 of 'vfs_getopt' from incompatible pointer type
> > *** Error code 1
> > 
> > Stop in /work/pub/head/sys/modules/linux.
> > *** Error code 1
> 
> Never saw that - must be something funny about compiling a Current
> kernel on a Release 7 box.
> 
> - Jamie

size_t != int on some arch.


# cat __tmp.patch
diff --git a/sys/compat/linux/linux_mib.c b/sys/compat/linux/linux_mib.c
index fd17773..c5734a0 100644
--- a/sys/compat/linux/linux_mib.c
+++ b/sys/compat/linux/linux_mib.c
@@ -223,7 +223,7 @@ linux_prison_check(void *obj __unused, void *data)
 {
        struct vfsoptlist *opts = data;
        char *osname, *osrelease;
-       size_t len;
+       int len;
        int error, oss_version;

        /* Check that the parameters are correct. */
@@ -263,7 +263,7 @@ linux_prison_set(void *obj, void *data)
        struct prison *pr = obj;
        struct vfsoptlist *opts = data;
        char *osname, *osrelease;
-       size_t len;
+       int len;
        int error, gotversion, nolinux, oss_version, yeslinux;

        /* Set the parameters, which should be correct. */

-- 
Have fun!
chd
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 196 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/svn-src-all/attachments/20090507/6a1a9a32/attachment.pgp