From owner-svn-src-head@FreeBSD.ORG Fri Nov 9 18:02:27 2012 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2F75EEDE; Fri, 9 Nov 2012 18:02:27 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 092738FC0A; Fri, 9 Nov 2012 18:02:27 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qA9I2QgD026164; Fri, 9 Nov 2012 18:02:26 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qA9I2QP6026142; Fri, 9 Nov 2012 18:02:26 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201211091802.qA9I2QP6026142@svn.freebsd.org> From: Attilio Rao Date: Fri, 9 Nov 2012 18:02:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r242833 - in head/sys: cddl/contrib/opensolaris/uts/common/fs/zfs fs/cd9660 fs/devfs fs/ext2fs fs/fdescfs fs/fuse fs/msdosfs fs/nandfs fs/nfsclient fs/nullfs fs/pseudofs fs/tmpfs fs/udf... X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 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, 09 Nov 2012 18:02:27 -0000 Author: attilio Date: Fri Nov 9 18:02:25 2012 New Revision: 242833 URL: http://svnweb.freebsd.org/changeset/base/242833 Log: Complete MPSAFE VFS interface and remove MNTK_MPSAFE flag. Porters should refer to __FreeBSD_version 1000021 for this change as it may have happened at the same timeframe. Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c head/sys/fs/cd9660/cd9660_vfsops.c head/sys/fs/devfs/devfs_vfsops.c head/sys/fs/ext2fs/ext2_vfsops.c head/sys/fs/fdescfs/fdesc_vfsops.c head/sys/fs/fuse/fuse_vfsops.c head/sys/fs/msdosfs/msdosfs_vfsops.c head/sys/fs/nandfs/nandfs_vfsops.c head/sys/fs/nfsclient/nfs_clvfsops.c head/sys/fs/nullfs/null_vfsops.c head/sys/fs/pseudofs/pseudofs.c head/sys/fs/tmpfs/tmpfs_vfsops.c head/sys/fs/udf/udf_vfsops.c head/sys/fs/unionfs/union_vfsops.c head/sys/fs/unionfs/union_vnops.c head/sys/gnu/fs/reiserfs/reiserfs_vfsops.c head/sys/kern/uipc_mqueue.c head/sys/kern/vfs_subr.c head/sys/nfsclient/nfs_vfsops.c head/sys/sys/mount.h head/sys/ufs/ffs/ffs_vfsops.c Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c Fri Nov 9 17:56:49 2012 (r242832) +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c Fri Nov 9 18:02:25 2012 (r242833) @@ -1132,7 +1132,6 @@ zfs_domount(vfs_t *vfsp, char *osname) vfsp->vfs_data = zfsvfs; vfsp->mnt_flag |= MNT_LOCAL; - vfsp->mnt_kern_flag |= MNTK_MPSAFE; vfsp->mnt_kern_flag |= MNTK_LOOKUP_SHARED; vfsp->mnt_kern_flag |= MNTK_SHARED_WRITES; vfsp->mnt_kern_flag |= MNTK_EXTENDED_SHARED; Modified: head/sys/fs/cd9660/cd9660_vfsops.c ============================================================================== --- head/sys/fs/cd9660/cd9660_vfsops.c Fri Nov 9 17:56:49 2012 (r242832) +++ head/sys/fs/cd9660/cd9660_vfsops.c Fri Nov 9 18:02:25 2012 (r242833) @@ -376,8 +376,7 @@ iso_mountfs(devvp, mp) mp->mnt_maxsymlinklen = 0; MNT_ILOCK(mp); mp->mnt_flag |= MNT_LOCAL; - mp->mnt_kern_flag |= MNTK_MPSAFE | MNTK_LOOKUP_SHARED | - MNTK_EXTENDED_SHARED; + mp->mnt_kern_flag |= MNTK_LOOKUP_SHARED | MNTK_EXTENDED_SHARED; MNT_IUNLOCK(mp); isomp->im_mountp = mp; isomp->im_dev = dev; Modified: head/sys/fs/devfs/devfs_vfsops.c ============================================================================== --- head/sys/fs/devfs/devfs_vfsops.c Fri Nov 9 17:56:49 2012 (r242832) +++ head/sys/fs/devfs/devfs_vfsops.c Fri Nov 9 18:02:25 2012 (r242833) @@ -131,8 +131,7 @@ devfs_mount(struct mount *mp) MNT_ILOCK(mp); mp->mnt_flag |= MNT_LOCAL; - mp->mnt_kern_flag |= MNTK_MPSAFE | MNTK_LOOKUP_SHARED | - MNTK_EXTENDED_SHARED; + mp->mnt_kern_flag |= MNTK_LOOKUP_SHARED | MNTK_EXTENDED_SHARED; #ifdef MAC mp->mnt_flag |= MNT_MULTILABEL; #endif Modified: head/sys/fs/ext2fs/ext2_vfsops.c ============================================================================== --- head/sys/fs/ext2fs/ext2_vfsops.c Fri Nov 9 17:56:49 2012 (r242832) +++ head/sys/fs/ext2fs/ext2_vfsops.c Fri Nov 9 18:02:25 2012 (r242833) @@ -665,8 +665,7 @@ ext2_mountfs(struct vnode *devvp, struct * Initialize filesystem stat information in mount struct. */ MNT_ILOCK(mp); - mp->mnt_kern_flag |= MNTK_MPSAFE | MNTK_LOOKUP_SHARED | - MNTK_EXTENDED_SHARED; + mp->mnt_kern_flag |= MNTK_LOOKUP_SHARED | MNTK_EXTENDED_SHARED; MNT_IUNLOCK(mp); return (0); out: Modified: head/sys/fs/fdescfs/fdesc_vfsops.c ============================================================================== --- head/sys/fs/fdescfs/fdesc_vfsops.c Fri Nov 9 17:56:49 2012 (r242832) +++ head/sys/fs/fdescfs/fdesc_vfsops.c Fri Nov 9 18:02:25 2012 (r242833) @@ -107,9 +107,6 @@ fdesc_mount(struct mount *mp) VOP_UNLOCK(rvp, 0); /* XXX -- don't mark as local to work around fts() problems */ /*mp->mnt_flag |= MNT_LOCAL;*/ - MNT_ILOCK(mp); - mp->mnt_kern_flag |= MNTK_MPSAFE; - MNT_IUNLOCK(mp); vfs_getnewfsid(mp); vfs_mountedfrom(mp, "fdescfs"); Modified: head/sys/fs/fuse/fuse_vfsops.c ============================================================================== --- head/sys/fs/fuse/fuse_vfsops.c Fri Nov 9 17:56:49 2012 (r242832) +++ head/sys/fs/fuse/fuse_vfsops.c Fri Nov 9 18:02:25 2012 (r242833) @@ -339,7 +339,6 @@ fuse_vfsop_mount(struct mount *mp) vfs_getnewfsid(mp); mp->mnt_flag |= MNT_LOCAL; - mp->mnt_kern_flag |= MNTK_MPSAFE; if (subtype) { strlcat(mp->mnt_stat.f_fstypename, ".", MFSNAMELEN); strlcat(mp->mnt_stat.f_fstypename, subtype, MFSNAMELEN); Modified: head/sys/fs/msdosfs/msdosfs_vfsops.c ============================================================================== --- head/sys/fs/msdosfs/msdosfs_vfsops.c Fri Nov 9 17:56:49 2012 (r242832) +++ head/sys/fs/msdosfs/msdosfs_vfsops.c Fri Nov 9 18:02:25 2012 (r242833) @@ -760,7 +760,6 @@ mountmsdosfs(struct vnode *devvp, struct mp->mnt_stat.f_fsid.val[1] = mp->mnt_vfc->vfc_typenum; MNT_ILOCK(mp); mp->mnt_flag |= MNT_LOCAL; - mp->mnt_kern_flag |= MNTK_MPSAFE; MNT_IUNLOCK(mp); if (pmp->pm_flags & MSDOSFS_LARGEFS) Modified: head/sys/fs/nandfs/nandfs_vfsops.c ============================================================================== --- head/sys/fs/nandfs/nandfs_vfsops.c Fri Nov 9 17:56:49 2012 (r242832) +++ head/sys/fs/nandfs/nandfs_vfsops.c Fri Nov 9 18:02:25 2012 (r242833) @@ -1383,7 +1383,6 @@ nandfs_mountfs(struct vnode *devvp, stru nmp->nm_ronly = ronly; MNT_ILOCK(mp); mp->mnt_flag |= MNT_LOCAL; - mp->mnt_kern_flag |= MNTK_MPSAFE; MNT_IUNLOCK(mp); nmp->nm_nandfsdev = nandfsdev; /* Add our mountpoint */ Modified: head/sys/fs/nfsclient/nfs_clvfsops.c ============================================================================== --- head/sys/fs/nfsclient/nfs_clvfsops.c Fri Nov 9 17:56:49 2012 (r242832) +++ head/sys/fs/nfsclient/nfs_clvfsops.c Fri Nov 9 18:02:25 2012 (r242833) @@ -1136,8 +1136,7 @@ nfs_mount(struct mount *mp) out: if (!error) { MNT_ILOCK(mp); - mp->mnt_kern_flag |= MNTK_MPSAFE | MNTK_LOOKUP_SHARED | - MNTK_NO_IOPF; + mp->mnt_kern_flag |= MNTK_LOOKUP_SHARED | MNTK_NO_IOPF; MNT_IUNLOCK(mp); } return (error); Modified: head/sys/fs/nullfs/null_vfsops.c ============================================================================== --- head/sys/fs/nullfs/null_vfsops.c Fri Nov 9 17:56:49 2012 (r242832) +++ head/sys/fs/nullfs/null_vfsops.c Fri Nov 9 18:02:25 2012 (r242833) @@ -189,8 +189,7 @@ nullfs_mount(struct mount *mp) } MNT_ILOCK(mp); mp->mnt_kern_flag |= lowerrootvp->v_mount->mnt_kern_flag & - (MNTK_MPSAFE | MNTK_SHARED_WRITES | MNTK_LOOKUP_SHARED | - MNTK_EXTENDED_SHARED); + (MNTK_SHARED_WRITES | MNTK_LOOKUP_SHARED | MNTK_EXTENDED_SHARED); mp->mnt_kern_flag |= MNTK_LOOKUP_EXCL_DOTDOT; MNT_IUNLOCK(mp); mp->mnt_data = xmp; Modified: head/sys/fs/pseudofs/pseudofs.c ============================================================================== --- head/sys/fs/pseudofs/pseudofs.c Fri Nov 9 17:56:49 2012 (r242832) +++ head/sys/fs/pseudofs/pseudofs.c Fri Nov 9 18:02:25 2012 (r242833) @@ -308,7 +308,6 @@ pfs_mount(struct pfs_info *pi, struct mo MNT_ILOCK(mp); mp->mnt_flag |= MNT_LOCAL; - mp->mnt_kern_flag |= MNTK_MPSAFE; MNT_IUNLOCK(mp); mp->mnt_data = pi; vfs_getnewfsid(mp); Modified: head/sys/fs/tmpfs/tmpfs_vfsops.c ============================================================================== --- head/sys/fs/tmpfs/tmpfs_vfsops.c Fri Nov 9 17:56:49 2012 (r242832) +++ head/sys/fs/tmpfs/tmpfs_vfsops.c Fri Nov 9 18:02:25 2012 (r242833) @@ -253,7 +253,6 @@ tmpfs_mount(struct mount *mp) MNT_ILOCK(mp); mp->mnt_flag |= MNT_LOCAL; - mp->mnt_kern_flag |= MNTK_MPSAFE; MNT_IUNLOCK(mp); mp->mnt_data = tmp; Modified: head/sys/fs/udf/udf_vfsops.c ============================================================================== --- head/sys/fs/udf/udf_vfsops.c Fri Nov 9 17:56:49 2012 (r242832) +++ head/sys/fs/udf/udf_vfsops.c Fri Nov 9 18:02:25 2012 (r242833) @@ -355,8 +355,7 @@ udf_mountfs(struct vnode *devvp, struct mp->mnt_stat.f_fsid.val[1] = mp->mnt_vfc->vfc_typenum; MNT_ILOCK(mp); mp->mnt_flag |= MNT_LOCAL; - mp->mnt_kern_flag |= MNTK_MPSAFE | MNTK_LOOKUP_SHARED | - MNTK_EXTENDED_SHARED; + mp->mnt_kern_flag |= MNTK_LOOKUP_SHARED | MNTK_EXTENDED_SHARED; MNT_IUNLOCK(mp); udfmp->im_mountp = mp; udfmp->im_dev = dev; Modified: head/sys/fs/unionfs/union_vfsops.c ============================================================================== --- head/sys/fs/unionfs/union_vfsops.c Fri Nov 9 17:56:49 2012 (r242832) +++ head/sys/fs/unionfs/union_vfsops.c Fri Nov 9 18:02:25 2012 (r242833) @@ -266,11 +266,6 @@ unionfs_domount(struct mount *mp) ump->um_copymode = copymode; ump->um_whitemode = whitemode; - MNT_ILOCK(mp); - if ((lowerrootvp->v_mount->mnt_kern_flag & MNTK_MPSAFE) && - (upperrootvp->v_mount->mnt_kern_flag & MNTK_MPSAFE)) - mp->mnt_kern_flag |= MNTK_MPSAFE; - MNT_IUNLOCK(mp); mp->mnt_data = ump; /* Modified: head/sys/fs/unionfs/union_vnops.c ============================================================================== --- head/sys/fs/unionfs/union_vnops.c Fri Nov 9 17:56:49 2012 (r242832) +++ head/sys/fs/unionfs/union_vnops.c Fri Nov 9 18:02:25 2012 (r242833) @@ -1867,8 +1867,7 @@ unionfs_lock(struct vop_lock1_args *ap) if ((revlock = unionfs_get_llt_revlock(vp, flags)) == 0) panic("unknown lock type: 0x%x", flags & LK_TYPE_MASK); - if ((mp->mnt_kern_flag & MNTK_MPSAFE) != 0 && - (vp->v_iflag & VI_OWEINACT) != 0) + if ((vp->v_iflag & VI_OWEINACT) != 0) flags |= LK_NOWAIT; /* Modified: head/sys/gnu/fs/reiserfs/reiserfs_vfsops.c ============================================================================== --- head/sys/gnu/fs/reiserfs/reiserfs_vfsops.c Fri Nov 9 17:56:49 2012 (r242832) +++ head/sys/gnu/fs/reiserfs/reiserfs_vfsops.c Fri Nov 9 18:02:25 2012 (r242833) @@ -580,7 +580,6 @@ reiserfs_mountfs(struct vnode *devvp, st mp->mnt_stat.f_fsid.val[1] = mp->mnt_vfc->vfc_typenum; MNT_ILOCK(mp); mp->mnt_flag |= MNT_LOCAL; - mp->mnt_kern_flag |= MNTK_MPSAFE; MNT_IUNLOCK(mp); #if defined(si_mountpoint) devvp->v_rdev->si_mountpoint = mp; Modified: head/sys/kern/uipc_mqueue.c ============================================================================== --- head/sys/kern/uipc_mqueue.c Fri Nov 9 17:56:49 2012 (r242832) +++ head/sys/kern/uipc_mqueue.c Fri Nov 9 18:02:25 2012 (r242833) @@ -582,7 +582,6 @@ mqfs_mount(struct mount *mp) mp->mnt_data = &mqfs_data; MNT_ILOCK(mp); mp->mnt_flag |= MNT_LOCAL; - mp->mnt_kern_flag |= MNTK_MPSAFE; MNT_IUNLOCK(mp); vfs_getnewfsid(mp); Modified: head/sys/kern/vfs_subr.c ============================================================================== --- head/sys/kern/vfs_subr.c Fri Nov 9 17:56:49 2012 (r242832) +++ head/sys/kern/vfs_subr.c Fri Nov 9 18:02:25 2012 (r242833) @@ -3110,7 +3110,6 @@ DB_SHOW_COMMAND(mount, db_show_mount) MNT_KERN_FLAG(MNTK_SUSPEND); MNT_KERN_FLAG(MNTK_SUSPEND2); MNT_KERN_FLAG(MNTK_SUSPENDED); - MNT_KERN_FLAG(MNTK_MPSAFE); MNT_KERN_FLAG(MNTK_LOOKUP_SHARED); MNT_KERN_FLAG(MNTK_NOKNOTE); #undef MNT_KERN_FLAG Modified: head/sys/nfsclient/nfs_vfsops.c ============================================================================== --- head/sys/nfsclient/nfs_vfsops.c Fri Nov 9 17:56:49 2012 (r242832) +++ head/sys/nfsclient/nfs_vfsops.c Fri Nov 9 18:02:25 2012 (r242833) @@ -1193,7 +1193,7 @@ nfs_mount(struct mount *mp) out: if (!error) { MNT_ILOCK(mp); - mp->mnt_kern_flag |= (MNTK_MPSAFE|MNTK_LOOKUP_SHARED); + mp->mnt_kern_flag |= MNTK_LOOKUP_SHARED; MNT_IUNLOCK(mp); } return (error); Modified: head/sys/sys/mount.h ============================================================================== --- head/sys/sys/mount.h Fri Nov 9 17:56:49 2012 (r242832) +++ head/sys/sys/mount.h Fri Nov 9 18:02:25 2012 (r242833) @@ -385,7 +385,7 @@ void __mnt_vnode_markerfree(str #define MNTK_SUSPEND 0x08000000 /* request write suspension */ #define MNTK_SUSPEND2 0x04000000 /* block secondary writes */ #define MNTK_SUSPENDED 0x10000000 /* write operations are suspended */ -#define MNTK_MPSAFE 0x20000000 /* Filesystem is MPSAFE. */ +#define MNTK_UNUSED25 0x20000000 /* --available-- */ #define MNTK_LOOKUP_SHARED 0x40000000 /* FS supports shared lock lookups */ #define MNTK_NOKNOTE 0x80000000 /* Don't send KNOTEs from VOP hooks */ Modified: head/sys/ufs/ffs/ffs_vfsops.c ============================================================================== --- head/sys/ufs/ffs/ffs_vfsops.c Fri Nov 9 17:56:49 2012 (r242832) +++ head/sys/ufs/ffs/ffs_vfsops.c Fri Nov 9 18:02:25 2012 (r242833) @@ -1063,8 +1063,8 @@ ffs_mountfs(devvp, mp, td) * Initialize filesystem stat information in mount struct. */ MNT_ILOCK(mp); - mp->mnt_kern_flag |= MNTK_MPSAFE | MNTK_LOOKUP_SHARED | - MNTK_EXTENDED_SHARED | MNTK_NO_IOPF; + mp->mnt_kern_flag |= MNTK_LOOKUP_SHARED | MNTK_EXTENDED_SHARED | + MNTK_NO_IOPF; MNT_IUNLOCK(mp); #ifdef UFS_EXTATTR #ifdef UFS_EXTATTR_AUTOSTART