From owner-svn-src-head@freebsd.org Fri Sep 23 20:38:08 2016 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 431DBBE6330; Fri, 23 Sep 2016 20:38:08 +0000 (UTC) (envelope-from andreast@FreeBSD.org) Received: from smtp.imp.ch (smtp.imp.ch [IPv6:2001:4060:1:1001::13:197]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0A72AC20; Fri, 23 Sep 2016 20:38:08 +0000 (UTC) (envelope-from andreast@FreeBSD.org) Received: from [192.168.225.14] (dhclient-91-190-14-19.flashcable.ch [91.190.14.19]) (using TLSv1 with cipher ECDHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by fgznet.ch (Postfix) with ESMTPSA id 94D341467E1; Fri, 23 Sep 2016 22:38:05 +0200 (CEST) Subject: Re: svn commit: r306272 - head/sys/sys To: Mateusz Guzik References: <201609231647.u8NGlCYF045234@repo.freebsd.org> <20160923200308.GB25423@dft-labs.eu> Cc: Mateusz Guzik , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org From: Andreas Tobler Message-ID: Date: Fri, 23 Sep 2016 22:38:05 +0200 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.11; rv:45.0) Gecko/20100101 Thunderbird/45.2.0 MIME-Version: 1.0 In-Reply-To: <20160923200308.GB25423@dft-labs.eu> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-Scanned-By: Idefix Submit on 127.0.1.1 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Sep 2016 20:38:08 -0000 On 23.09.16 22:03, Mateusz Guzik wrote: > 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. > Thanks, I reverted locally to continue my work. So no hurry. Andreas