From owner-svn-src-all@FreeBSD.ORG Tue Oct 22 18:55:41 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 514247AD; Tue, 22 Oct 2013 18:55:41 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: from mail-qa0-x22f.google.com (mail-qa0-x22f.google.com [IPv6:2607:f8b0:400d:c00::22f]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BFB532F74; Tue, 22 Oct 2013 18:55:40 +0000 (UTC) Received: by mail-qa0-f47.google.com with SMTP id k15so3627090qaq.13 for ; Tue, 22 Oct 2013 11:55:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=JLlRKbQB0+s1dK3MSq9AgiwstoyWtf0IkOrXd2Hfefs=; b=eE7vjfO6C1r/WjkNtXNbm4xKUWchMrv9ll72E8z1FmGPqSoM2xtNhX0f9U7PL+2Id/ mQoAmfez/UHHvnEpa4iKOq8LQcvAziy94eyOBrN1tCrRKeosKJd5f2K5XijiwnO/zrSh esiEkJ5UEa2JJVSE7+Hstsdgc0WGIh90IGrNgIAXycfUknOXr0eBCb/VEBD6w3vi02oo k0heVgzNH73Bkr2KNlw1b+6Ysoijf+aZfX4ZLJmtW0bkz2ss7tVRPYoA2AZB6U8DPAXv Vj6PxmPvb05oJIjyf8p272HNtTh6wqz/Vndptsxr7bZLKg2akrxksdS9dQlyVL5stS04 akRA== MIME-Version: 1.0 X-Received: by 10.224.36.201 with SMTP id u9mr31828508qad.76.1382468139942; Tue, 22 Oct 2013 11:55:39 -0700 (PDT) Sender: adrian.chadd@gmail.com Received: by 10.224.207.66 with HTTP; Tue, 22 Oct 2013 11:55:39 -0700 (PDT) In-Reply-To: <201310221447.35676.jhb@freebsd.org> References: <201310221021.r9MALLhP097274@svn.freebsd.org> <201310221447.35676.jhb@freebsd.org> Date: Tue, 22 Oct 2013 11:55:39 -0700 X-Google-Sender-Auth: ftFFiG9Sl0G5rbtanvIteZaagig Message-ID: Subject: Re: svn commit: r256884 - in head: share/man/man9 sys/geom From: Adrian Chadd To: John Baldwin Content-Type: text/plain; charset=ISO-8859-1 X-Content-Filtered-By: Mailman/MimeDel 2.1.14 Cc: "svn-src-head@freebsd.org" , Alexander Motin , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Oct 2013 18:55:41 -0000 Hi, I definitely agree with marking 0x1 as being reserved, at least for the lifecycle of 10.x up until 11.x. -adrian On 22 October 2013 11:47, John Baldwin wrote: > On Tuesday, October 22, 2013 6:21:21 am Alexander Motin wrote: > > Author: mav > > Date: Tue Oct 22 10:21:20 2013 > > New Revision: 256884 > > URL: http://svnweb.freebsd.org/changeset/base/256884 > > > > Log: > > Remove Giant-locked drivers support (DISKFLAG_NEEDSGIANT flag) from > disk(9). > > > > Since at least FreeBSD 7 we had only four of them in the base tree, and > > in head branch, thanks to jhb@, we have no any for more then a year. > > I had this additional change in my local branch, what do you think of it? > We > should probably keep it unless we bump DISK_VERSION and drop support for > older > disk structures. I think we could probably merge it to 10 along with your > change as well: > > --- //depot/vendor/freebsd/src/sys/geom/geom_disk.c > +++ //depot/user/jhb/cleanup/sys/geom/geom_disk.c > @@ -654,6 +654,13 @@ > dp->d_name, dp->d_unit); > return; > } > + if (dp->d_flags & DISKFLAG_RESERVED) { > + printf("WARNING: Attempt to add non-MPSAFE disk %s%d\n", > + dp->d_name, dp->d_unit); > + printf("WARNING: Ignoring disk %s%d\n", > + dp->d_name, dp->d_unit); > + return; > + } > KASSERT(dp->d_strategy != NULL, ("disk_create need d_strategy")); > KASSERT(dp->d_name != NULL, ("disk_create need d_name")); > KASSERT(*dp->d_name != 0, ("disk_create need d_name")); > --- //depot/vendor/freebsd/src/sys/geom/geom_disk.h > +++ //depot/user/jhb/cleanup/sys/geom/geom_disk.h > @@ -102,6 +102,7 @@ > void *d_drv1; > }; > > +#define DISKFLAG_RESERVED 0x1 /* Was NEEDSGIANT */ > #define DISKFLAG_OPEN 0x2 > #define DISKFLAG_CANDELETE 0x4 > #define DISKFLAG_CANFLUSHCACHE 0x8 > > -- > John Baldwin >