From owner-p4-projects Fri Dec 6 14: 3:27 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2937637B404; Fri, 6 Dec 2002 14:03:25 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B632837B401 for ; Fri, 6 Dec 2002 14:03:24 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BA15543EB2 for ; Fri, 6 Dec 2002 14:03:23 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gB6LwumV040879 for ; Fri, 6 Dec 2002 13:58:56 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gB6LwuPs040876 for perforce@freebsd.org; Fri, 6 Dec 2002 13:58:56 -0800 (PST) Date: Fri, 6 Dec 2002 13:58:56 -0800 (PST) Message-Id: <200212062158.gB6LwuPs040876@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 22011 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22011 Change 22011 by rwatson@rwatson_tislabs on 2002/12/06 13:58:21 Attempt to improve consistency of mountpoint stuff in devfs with the remainder of the devfs source code for the merge. Affected files ... .. //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs.h#10 edit .. //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_devs.c#10 edit .. //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vfsops.c#14 edit .. //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vnops.c#36 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs.h#10 (text+ko) ==== @@ -168,7 +168,7 @@ }; struct devfs_mount { - struct mount *dm_mountp; /* filesystem vfs structure */ + struct mount *dm_mount; struct devfs_dirent *dm_rootdir; struct devfs_dirent *dm_basedir; unsigned dm_generation; ==== //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_devs.c#10 (text+ko) ==== @@ -335,7 +335,7 @@ de = devfs_vmkdir(s, q - s, dd); #ifdef MAC mac_create_devfs_directory( - dm->dm_mountp, s, q - s, de); + dm->dm_mount, s, q - s, de); #endif de->de_inode = dm->dm_inode++; TAILQ_INSERT_TAIL(&dd->de_dlist, de, de_list); @@ -363,7 +363,7 @@ de->de_dirent->d_type = DT_CHR; } #ifdef MAC - mac_create_devfs_device(dm->dm_mountp, dev, de); + mac_create_devfs_device(dm->dm_mount, dev, de); #endif *dep = de; de->de_dir = dd; ==== //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vfsops.c#14 (text+ko) ==== @@ -88,7 +88,7 @@ #ifdef MAC mp->mnt_flag |= MNT_MULTILABEL; #endif - fmp->dm_mountp = mp; + fmp->dm_mount = mp; mp->mnt_data = (qaddr_t) fmp; vfs_getnewfsid(mp); ==== //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vnops.c#36 (text+ko) ==== @@ -869,7 +869,7 @@ bcopy(ap->a_target, de->de_symlink, i); lockmgr(&dmp->dm_lock, LK_EXCLUSIVE, 0, curthread); #ifdef MAC - mac_create_devfs_symlink(dmp->dm_mountp, ap->a_cnp->cn_cred, dd, de); + mac_create_devfs_symlink(dmp->dm_mount, ap->a_cnp->cn_cred, dd, de); #endif TAILQ_INSERT_TAIL(&dd->de_dlist, de, de_list); devfs_allocv(de, ap->a_dvp->v_mount, ap->a_vpp, 0); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message