From owner-freebsd-stable@FreeBSD.ORG Mon Oct 16 06:33:06 2006 Return-Path: X-Original-To: stable@freebsd.org Delivered-To: freebsd-stable@FreeBSD.ORG Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EB72616A412; Mon, 16 Oct 2006 06:33:06 +0000 (UTC) (envelope-from rink@rink.nu) Received: from mx0.rink.nu (thunderstone.rink.nu [80.112.228.34]) by mx1.FreeBSD.org (Postfix) with ESMTP id 584E943D60; Mon, 16 Oct 2006 06:33:03 +0000 (GMT) (envelope-from rink@rink.nu) Received: from localhost (localhost [127.0.0.1]) by mx0.rink.nu (Postfix) with ESMTP id 3D2DA170A8; Mon, 16 Oct 2006 08:33:44 +0200 (CEST) X-Virus-Scanned: amavisd-new at rink.nu Received: from mx0.rink.nu ([127.0.0.1]) by localhost (thunderstone.rink.nu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5OE8YGKuAB25; Mon, 16 Oct 2006 08:33:38 +0200 (CEST) Received: by mx0.rink.nu (Postfix, from userid 1000) id 7FB78170A5; Mon, 16 Oct 2006 08:33:38 +0200 (CEST) Date: Mon, 16 Oct 2006 08:33:38 +0200 From: Rink Springer To: Rink Springer , Lin Jui-Nan Eric , stable@freebsd.org Message-ID: <20061016063338.GC51499@rink.nu> References: <47713ee10610150811w4cca315etc051e0fe14d88dab@mail.gmail.com> <20061015151924.GA50017@rink.nu> <47713ee10610150830g4dc4b747j9425d3b5194829f1@mail.gmail.com> <20061015154022.GC50017@rink.nu> <20061015220111.GA10634@Update.UU.SE> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20061015220111.GA10634@Update.UU.SE> User-Agent: Mutt/1.5.13 (2006-08-11) Cc: Subject: Re: mountd changed? X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Oct 2006 06:33:07 -0000 Hi Erik, On Mon, Oct 16, 2006 at 12:01:11AM +0200, Erik Trulsson wrote: > [Second attempt to send this, since my first seems to have been eaten by my > ISP. Apologies if it appears twice.] > > On Sun, Oct 15, 2006 at 05:40:22PM +0200, Rink Springer wrote: > > Hi, > > > > On Sun, Oct 15, 2006 at 11:30:23PM +0800, Lin Jui-Nan Eric wrote: > > > Hi, > > > > > > If I revert to revision 1.81.2.4, it worked correctly. > > > > > > On 10/15/06, Rink Springer wrote: > > > >Hi, > > > > > > > >Hmm, I recently changed something which might trigger this. Could you > > > >back out revision 1.81.2.5 of src/usr.sbin/mountd/mountd.c and let me > > > >know whether this fixed the problem? > > > > > > > > OK, could you try the attached patch (untested) and let me know whether > > it works? (it patches the 1.81.2.5 revision of mountd.c) > > I had the same problems, but only when trying to export directories from > the root filesystem. Your patch below would not help. > The following patch (very much inspired by the comment on line 1038 in > mountd.c) makes things work for me: > > Index: mountd.c > =================================================================== > RCS file: /ncvs/src/usr.sbin/mountd/mountd.c,v > retrieving revision 1.81.2.5 > diff -u -r1.81.2.5 mountd.c > --- mountd.c 14 Oct 2006 23:04:07 -0000 1.81.2.5 > +++ mountd.c 15 Oct 2006 21:09:20 -0000 > @@ -1911,7 +1911,7 @@ > iov[5].iov_base = fsb->f_mntfromname; /* "from" */ > iov[5].iov_len = strlen(fsb->f_mntfromname) + 1; > > - while (nmount(iov, iovlen, fsb->f_flags) < 0) { > + while (nmount(iov, iovlen, fsb->f_flags & ~MNT_ROOTFS) < 0) { > if (cp) > *cp-- = savedc; > else > > > > > > > > --- mountd.c.org Thu Sep 21 10:07:57 2006 > > +++ mountd.c Thu Sep 21 10:08:42 2006 > > @@ -1912,7 +1912,7 @@ > > iov[5].iov_base = fsb->f_mntfromname; /* "from" */ > > iov[5].iov_len = strlen(fsb->f_mntfromname) + 1; > > > > - while (nmount(iov, iovlen, fsb->f_flags) < 0) { > > + while (nmount(iov, iovlen, fsb->f_flags | MNT_UPDATE) < 0) { > > if (cp) > > *cp-- = savedc; > > else Ah, it seems that nmount(2) will deny any mount that has the MNT_ROOTFS flag set; whereas this flag is returned by getmntinfo(). I'll get this committed. Thanks for the report and patch! -- Rink P.W. Springer - http://rink.nu "Patience is for those who cannot afford decent hardware." - Peter Koeleman