diff options
author | phk <phk@FreeBSD.org> | 2005-08-15 19:40:53 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 2005-08-15 19:40:53 +0000 |
commit | 4edc625526a0888377f8b5dbfbbe272e124dc20b (patch) | |
tree | ad29e7ffc4e4d852fe438948333a5da1ca80b909 /sys/fs | |
parent | 74c8ef50806cfbe7442226b806bb5c4694fe4899 (diff) | |
download | FreeBSD-src-4edc625526a0888377f8b5dbfbbe272e124dc20b.zip FreeBSD-src-4edc625526a0888377f8b5dbfbbe272e124dc20b.tar.gz |
Eliminate effectively unused dm_basedir field from devfs_mount.
Diffstat (limited to 'sys/fs')
-rw-r--r-- | sys/fs/devfs/devfs.h | 1 | ||||
-rw-r--r-- | sys/fs/devfs/devfs_devs.c | 2 | ||||
-rw-r--r-- | sys/fs/devfs/devfs_rule.c | 2 | ||||
-rw-r--r-- | sys/fs/devfs/devfs_vfsops.c | 1 | ||||
-rw-r--r-- | sys/fs/devfs/devfs_vnops.c | 2 |
5 files changed, 3 insertions, 5 deletions
diff --git a/sys/fs/devfs/devfs.h b/sys/fs/devfs/devfs.h index c8f1074..7a71c48 100644 --- a/sys/fs/devfs/devfs.h +++ b/sys/fs/devfs/devfs.h @@ -169,7 +169,6 @@ struct devfs_dirent { struct devfs_mount { struct mount *dm_mount; struct devfs_dirent *dm_rootdir; - struct devfs_dirent *dm_basedir; unsigned dm_generation; struct devfs_dirent **dm_dirent; struct devfs_dirent **dm_overflow; diff --git a/sys/fs/devfs/devfs_devs.c b/sys/fs/devfs/devfs_devs.c index 172a63c..e59f6c0 100644 --- a/sys/fs/devfs/devfs_devs.c +++ b/sys/fs/devfs/devfs_devs.c @@ -284,7 +284,7 @@ devfs_populate(struct devfs_mount *dm) continue; if (!devfs_getref(i)) continue; - dd = dm->dm_basedir; + dd = dm->dm_rootdir; s = dev->si_name; for (;;) { for (q = s; *q != '/' && *q != '\0'; q++) diff --git a/sys/fs/devfs/devfs_rule.c b/sys/fs/devfs/devfs_rule.c index 5168efe..7469aec 100644 --- a/sys/fs/devfs/devfs_rule.c +++ b/sys/fs/devfs/devfs_rule.c @@ -404,7 +404,7 @@ static void devfs_rule_applydm(struct devfs_krule *dk, struct devfs_mount *dm) { - devfs_rule_applyde_recursive(dk, dm->dm_basedir); + devfs_rule_applyde_recursive(dk, dm->dm_rootdir); } /* diff --git a/sys/fs/devfs/devfs_vfsops.c b/sys/fs/devfs/devfs_vfsops.c index b93f123..307b4a2 100644 --- a/sys/fs/devfs/devfs_vfsops.c +++ b/sys/fs/devfs/devfs_vfsops.c @@ -93,7 +93,6 @@ devfs_mount(struct mount *mp, struct thread *td) #ifdef MAC mac_create_devfs_directory(mp, "", 0, fmp->dm_rootdir); #endif - fmp->dm_basedir = fmp->dm_rootdir; devfs_rules_newmount(fmp, td); error = devfs_root(mp, LK_EXCLUSIVE, &rvp, td); diff --git a/sys/fs/devfs/devfs_vnops.c b/sys/fs/devfs/devfs_vnops.c index 8f14bcf..c8707af 100644 --- a/sys/fs/devfs/devfs_vnops.c +++ b/sys/fs/devfs/devfs_vnops.c @@ -222,7 +222,7 @@ devfs_fqpn(char *buf, struct vnode *dvp, struct componentname *cnp) return (NULL); bcopy(cnp->cn_nameptr, buf + i, cnp->cn_namelen); de = dd; - while (de != dmp->dm_basedir) { + while (de != dmp->dm_rootdir) { i--; if (i < 0) return (NULL); |