Date: Fri, 3 May 2002 11:48:35 -0700 (PDT) From: Julian Elischer <julian@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 10751 for review Message-ID: <200205031848.g43ImZo44934@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10751 Change 10751 by julian@julian_jules1 on 2002/05/03 11:47:51 check MFC Affected files ... ... //depot/projects/kse/sys/alpha/conf/GENERIC#12 integrate ... //depot/projects/kse/sys/dev/md/md.c#17 integrate ... //depot/projects/kse/sys/fs/hpfs/hpfs_vnops.c#9 integrate ... //depot/projects/kse/sys/i386/conf/GENERIC#16 integrate ... //depot/projects/kse/sys/pc98/conf/GENERIC#15 integrate ... //depot/projects/kse/sys/sparc64/conf/GENERIC#10 integrate Differences ... ==== //depot/projects/kse/sys/alpha/conf/GENERIC#12 (text+ko) ==== @@ -19,7 +19,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.137 2002/04/18 03:44:44 rwatson Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.138 2002/05/03 17:59:21 jmallett Exp $ machine alpha cpu EV4 @@ -74,7 +74,7 @@ options DDB #Enable the kernel debugger options INVARIANTS #Enable calls of extra sanity checking options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS -#options WITNESS #Enable checks to detects deadlocks and cycles +#options WITNESS #Enable checks to detect deadlocks and cycles # To make an SMP kernel, the next line is needed options SMP # Symmetric MultiProcessor Kernel ==== //depot/projects/kse/sys/dev/md/md.c#17 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sys/dev/md/md.c,v 1.57 2002/03/20 09:55:07 jeff Exp $ + * $FreeBSD: src/sys/dev/md/md.c,v 1.58 2002/05/03 17:55:10 phk Exp $ * */ @@ -609,18 +609,6 @@ struct nameidata nd; int error, flags; - if (mdio->md_options & MD_AUTOUNIT) { - sc = mdnew(-1); - mdio->md_unit = sc->unit; - } else { - sc = mdnew(mdio->md_unit); - } - if (sc == NULL) - return (EBUSY); - - sc->type = MD_VNODE; - sc->flags = mdio->md_options & MD_FORCE; - flags = FREAD|FWRITE; NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, mdio->md_file, td); error = vn_open(&nd, &flags, 0); @@ -628,7 +616,6 @@ if (error != EACCES && error != EPERM && error != EROFS) return (error); flags &= ~FWRITE; - sc->flags |= MD_READONLY; NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, mdio->md_file, td); error = vn_open(&nd, &flags, 0); if (error) @@ -642,6 +629,22 @@ return (error ? error : EINVAL); } VOP_UNLOCK(nd.ni_vp, 0, td); + + if (mdio->md_options & MD_AUTOUNIT) { + sc = mdnew(-1); + mdio->md_unit = sc->unit; + } else { + sc = mdnew(mdio->md_unit); + } + if (sc == NULL) { + (void) vn_close(nd.ni_vp, flags, td->td_ucred, td); + return (EBUSY); + } + + sc->type = MD_VNODE; + sc->flags = mdio->md_options & MD_FORCE; + if (!(flags & FWRITE)) + sc->flags |= MD_READONLY; sc->secsize = DEV_BSIZE; sc->vnode = nd.ni_vp; ==== //depot/projects/kse/sys/fs/hpfs/hpfs_vnops.c#9 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/hpfs/hpfs_vnops.c,v 1.27 2002/04/08 08:12:42 phk Exp $ + * $FreeBSD: src/sys/fs/hpfs/hpfs_vnops.c,v 1.28 2002/05/03 18:23:29 phk Exp $ */ #include <sys/param.h> @@ -1275,8 +1275,6 @@ { &vop_readdir_desc, (vop_t *)hpfs_readdir }, { &vop_fsync_desc, (vop_t *)hpfs_fsync }, { &vop_bmap_desc, (vop_t *)hpfs_bmap }, - { &vop_getpages_desc, (vop_t *) vop_stdgetpages }, - { &vop_putpages_desc, (vop_t *) vop_stdputpages }, { &vop_strategy_desc, (vop_t *)hpfs_strategy }, { &vop_read_desc, (vop_t *)hpfs_read }, { &vop_write_desc, (vop_t *)hpfs_write }, ==== //depot/projects/kse/sys/i386/conf/GENERIC#16 (text+ko) ==== @@ -15,7 +15,7 @@ # device lines is also present in the NOTES configuration file. If you are # in doubt as to the purpose or necessity of a line, check first in NOTES. # -# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.340 2002/04/27 01:31:16 scottl Exp $ +# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.341 2002/05/03 17:59:22 jmallett Exp $ machine i386 cpu I486_CPU @@ -56,7 +56,7 @@ options DDB #Enable the kernel debugger options INVARIANTS #Enable calls of extra sanity checking options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS -options WITNESS #Enable checks to detects deadlocks and cycles +options WITNESS #Enable checks to detect deadlocks and cycles options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed # To make an SMP kernel, the next two are needed ==== //depot/projects/kse/sys/pc98/conf/GENERIC#15 (text+ko) ==== @@ -15,7 +15,7 @@ # device lines is also present in the NOTES configuration file. If you are # in doubt as to the purpose or necessity of a line, check first in NOTES. # -# $FreeBSD: src/sys/pc98/conf/GENERIC,v 1.202 2002/04/25 13:32:56 nyan Exp $ +# $FreeBSD: src/sys/pc98/conf/GENERIC,v 1.203 2002/05/03 17:59:23 jmallett Exp $ machine pc98 #cpu I386_CPU #Do not enable with other cpu types @@ -62,7 +62,7 @@ options DDB #Enable the kernel debugger options INVARIANTS #Enable calls of extra sanity checking options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS -options WITNESS #Enable checks to detects deadlocks and cycles +options WITNESS #Enable checks to detect deadlocks and cycles options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed # To make an SMP kernel, the next two are needed ==== //depot/projects/kse/sys/sparc64/conf/GENERIC#10 (text+ko) ==== @@ -19,7 +19,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/sparc64/conf/GENERIC,v 1.15 2002/04/18 03:44:44 rwatson Exp $ +# $FreeBSD: src/sys/sparc64/conf/GENERIC,v 1.16 2002/05/03 17:59:25 jmallett Exp $ machine sparc64 cpu SUN4U @@ -61,7 +61,7 @@ options BREAK_TO_DEBUGGER #a BREAK on a comconsole drops to DDB options INVARIANTS #Enable calls of extra sanity checking options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS -#options WITNESS #Enable checks to detects deadlocks and cycles +#options WITNESS #Enable checks to detect deadlocks and cycles # To make an SMP kernel, the next line is needed options SMP # Symmetric MultiProcessor Kernel To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200205031848.g43ImZo44934>