diff options
| author |   jsing <jsing@openbsd.org> | 2013-04-15 15:32:19 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2013-04-15 15:32:19 +0000 |
| commit | aec3986e4c77ef418b044f5a18f9ea2d3dfdc5ca (patch) | |
| tree | 0ef0402a8c1ce45cd17a6e33cb6f909d524c8384 /sys/kern/vfs_subr.c | |
| parent | sync (diff) | |
| download | wireguard-openbsd-aec3986e4c77ef418b044f5a18f9ea2d3dfdc5ca.tar.xz wireguard-openbsd-aec3986e4c77ef418b044f5a18f9ea2d3dfdc5ca.zip | |
Add an f_mntfromspec member to struct statfs, which specifies the name of
the special provided when the mount was requested. This may be the same as
the special that was actually used for the mount (e.g. in the case of a
device node) or it may be different (e.g. in the case of a DUID).
Whilst here, change f_ctime to a 64 bit type and remove the pointless
f_spare members.
Compatibility goo courtesy of guenther@
ok krw@ millert@
Diffstat (limited to 'sys/kern/vfs_subr.c')
| -rw-r--r-- | sys/kern/vfs_subr.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 764d8b8e4e9..8417a3ebe0c 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_subr.c,v 1.202 2013/02/17 17:39:29 miod Exp $ */ +/* $OpenBSD: vfs_subr.c,v 1.203 2013/04/15 15:32:19 jsing Exp $ */ /* $NetBSD: vfs_subr.c,v 1.53 1996/04/22 01:39:13 christos Exp $ */ /* @@ -224,7 +224,8 @@ vfs_rootmountalloc(char *fstypename, char *devname, struct mount **mpp) mp->mnt_flag |= vfsp->vfc_flags & MNT_VISFLAGMASK; strncpy(mp->mnt_stat.f_fstypename, vfsp->vfc_name, MFSNAMELEN); mp->mnt_stat.f_mntonname[0] = '/'; - (void)copystr(devname, mp->mnt_stat.f_mntfromname, MNAMELEN - 1, 0); + copystr(devname, mp->mnt_stat.f_mntfromname, MNAMELEN, 0); + copystr(devname, mp->mnt_stat.f_mntfromspec, MNAMELEN, 0); *mpp = mp; return (0); } @@ -2244,9 +2245,9 @@ vfs_mount_print(struct mount *mp, int full, (*pr)(" syncreads %llu asyncreads = %llu\n", mp->mnt_stat.f_syncreads, mp->mnt_stat.f_asyncreads); - (*pr)(" fstype \"%s\" mnton \"%s\" mntfrom \"%s\"\n", + (*pr)(" fstype \"%s\" mnton \"%s\" mntfrom \"%s\" mntspec \"%s\"\n", mp->mnt_stat.f_fstypename, mp->mnt_stat.f_mntonname, - mp->mnt_stat.f_mntfromname); + mp->mnt_stat.f_mntfromname, mp->mnt_stat.f_mntfromspec); (*pr)("locked vnodes:"); /* XXX would take mountlist lock, except ddb has no context */ @@ -2296,6 +2297,7 @@ copy_statfs_info(struct statfs *sbp, const struct mount *mp) sbp->f_namemax = mbp->f_namemax; bcopy(mp->mnt_stat.f_mntonname, sbp->f_mntonname, MNAMELEN); bcopy(mp->mnt_stat.f_mntfromname, sbp->f_mntfromname, MNAMELEN); + bcopy(mp->mnt_stat.f_mntfromspec, sbp->f_mntfromspec, MNAMELEN); bcopy(&mp->mnt_stat.mount_info.ufs_args, &sbp->mount_info.ufs_args, sizeof(struct ufs_args)); } |