svn commit: r306272 - head/sys/sys

Mateusz Guzik mjguzik at gmail.com
Fri Sep 23 20:03:14 UTC 2016


On Fri, Sep 23, 2016 at 09:59:32PM +0200, Andreas Tobler wrote:
> On 23.09.16 18:47, Mateusz Guzik wrote:
> >Author: mjg
> >Date: Fri Sep 23 16:47:12 2016
> >New Revision: 306272
> >URL: https://svnweb.freebsd.org/changeset/base/306272
> >
> >Log:
> >  fd: hide fd_modified under CAPABILITIES
> >
> >  It has no use without it and is now less error prone.
> >
> >Modified:
> >  head/sys/sys/filedesc.h
> >
> >Modified: head/sys/sys/filedesc.h
> >==============================================================================
> >--- head/sys/sys/filedesc.h	Fri Sep 23 16:22:03 2016	(r306271)
> >+++ head/sys/sys/filedesc.h	Fri Sep 23 16:47:12 2016	(r306272)
> >@@ -229,12 +229,14 @@ fdeget_locked(struct filedesc *fdp, int
> > 	return (fde);
> > }
> >
> >+#ifdef CAPABILITIES
> > static __inline bool
> > fd_modified(struct filedesc *fdp, int fd, seq_t seq)
> > {
> >
> > 	return (!seq_consistent(fd_seq(fdp->fd_files, fd), seq));
> > }
> >+#endif
> >
> > /* cdir/rdir/jdir manipulation functions. */
> > void	pwd_chdir(struct thread *td, struct vnode *vp);
> 
> I think this breaks kernel builds:
> 
> /usr/src/sys/modules/cloudabi/../../compat/cloudabi/cloudabi_fd.c:482:14:
> error: implicit declaration of function 'fd_modified' is invalid in
> C99 [-Werror,-Wimplicit-function-declaration]
>                 modified = fd_modified(fdp, uap->fd, seq);
>                            ^
> 1 error generated.
> *** [cloudabi_fd.o] Error code 1
> 

Ye indeed, I hacked up a fix:
https://people.freebsd.org/~mjg/patches/cloudabi-fd_modified.diff

if ed@ does not respond soon acking the patch, I'll temporarily reviert
this change.

-- 
Mateusz Guzik <mjguzik gmail.com>


More information about the svn-src-head mailing list