PERFORCE change 22011 for review

[Robert Watson]

http://perforce.freebsd.org/chv.cgi?CH=22011

Change 22011 by rwatson at 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 at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message