d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert devfs part of r235911. I was unaware about old but unfinished

Browse Source 
discussion between kib@ and gibbs@ about it.
This commit is contained in:
Alexander Motin 2012-05-24 18:19:23 +00:00
parent 2889eb8bdf
commit d499701b0c
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=235922
1 changed files with 0 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
sys/fs/devfs/devfs_vnops.c
View File

@ -1266,53 +1266,8 @@ static int
devfs_readlink(struct vop_readlink_args *ap)
{
struct devfs_dirent *de;
struct cdev_priv *cdp;
de = ap->a_vp->v_data;
cdp = de->de_cdp;
if (cdp != NULL && (cdp->cdp_c.si_flags & SI_ALIAS) != 0) {
struct devfs_mount *dmp;
struct prison *pr;
char *mp;
int mp_len;
int pr_path_len;
int err;
/*
* For device aliases, construct an absolute symlink (to
* shorten its length and avoid the ugliness of a relative
* link) by prepending the fully qualified path to the root
* of this devfs. For a non-jailed process, the devfs root
* is our mount point. For a jailed process, we must remove
* any jail prefix in our mount point so that our response
* matches the user process's world view.
*/
dmp = VFSTODEVFS(ap->a_vp->v_mount);
mp = dmp->dm_mount->mnt_stat.f_mntonname;
mp_len = strlen(mp);
pr = ap->a_cred->cr_prison;
pr_path_len = strlen(pr->pr_path);
if (strncmp(pr->pr_path, mp, pr_path_len) == 0
&& mp[pr_path_len] == '/') {
mp += pr_path_len;
mp_len -= pr_path_len;
}
err = uiomove(mp, mp_len, ap->a_uio);
if (err != 0)
return (err);
/*
* Devfs cannot be the root file system, so its
* mount point must always be terminated by a '/'.
*/
err = uiomove("/", 1, ap->a_uio);
if (err != 0)
return (err);
}
return (uiomove(de->de_symlink, strlen(de->de_symlink), ap->a_uio));
}