aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Evans <bde@FreeBSD.org>1999-08-23 21:07:13 +0000
committerBruce Evans <bde@FreeBSD.org>1999-08-23 21:07:13 +0000
commit939cb7521a6aec9299f65a8371ff66e5c7f2e403 (patch)
tree0f93a80aab88a598df53b8d02c468f0b4b797ef1
parent0b770227520b9e96ee3cbf85ec887cad140b96e2 (diff)
downloadsrc-939cb7521a6aec9299f65a8371ff66e5c7f2e403.tar.gz
src-939cb7521a6aec9299f65a8371ff66e5c7f2e403.zip
Initialise fsids with (user) device numbers again. Bitrot when dev_t's
were changed to pointers was obscured by casting dev_t's to longs. fsids haven't even been comprised of longs since the Lite2 merge.
Notes
Notes: svn path=/head/; revision=50256
-rw-r--r--sys/fs/cd9660/cd9660_vfsops.c4
-rw-r--r--sys/fs/msdosfs/msdosfs_vfsops.c4
-rw-r--r--sys/gnu/ext2fs/ext2_vfsops.c2
-rw-r--r--sys/gnu/fs/ext2fs/ext2_vfsops.c2
-rw-r--r--sys/isofs/cd9660/cd9660_vfsops.c4
-rw-r--r--sys/msdosfs/msdosfs_vfsops.c4
6 files changed, 10 insertions, 10 deletions
diff --git a/sys/fs/cd9660/cd9660_vfsops.c b/sys/fs/cd9660/cd9660_vfsops.c
index 3e9ada1e4080..2e007dbf73d9 100644
--- a/sys/fs/cd9660/cd9660_vfsops.c
+++ b/sys/fs/cd9660/cd9660_vfsops.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)cd9660_vfsops.c 8.18 (Berkeley) 5/22/95
- * $Id: cd9660_vfsops.c,v 1.57 1999/08/08 18:42:45 phk Exp $
+ * $Id: cd9660_vfsops.c,v 1.58 1999/08/13 10:29:18 phk Exp $
*/
#include <sys/param.h>
@@ -436,7 +436,7 @@ iso_mountfs(devvp, mp, p, argp)
pribp = NULL;
mp->mnt_data = (qaddr_t)isomp;
- mp->mnt_stat.f_fsid.val[0] = (long)dev;
+ mp->mnt_stat.f_fsid.val[0] = dev2udev(dev);
mp->mnt_stat.f_fsid.val[1] = mp->mnt_vfc->vfc_typenum;
mp->mnt_maxsymlinklen = 0;
mp->mnt_flag |= MNT_LOCAL;
diff --git a/sys/fs/msdosfs/msdosfs_vfsops.c b/sys/fs/msdosfs/msdosfs_vfsops.c
index 2729126512ca..f8c739274423 100644
--- a/sys/fs/msdosfs/msdosfs_vfsops.c
+++ b/sys/fs/msdosfs/msdosfs_vfsops.c
@@ -1,4 +1,4 @@
-/* $Id: msdosfs_vfsops.c,v 1.46 1999/08/08 18:42:54 phk Exp $ */
+/* $Id: msdosfs_vfsops.c,v 1.47 1999/08/13 10:29:26 phk Exp $ */
/* $NetBSD: msdosfs_vfsops.c,v 1.51 1997/11/17 15:36:58 ws Exp $ */
/*-
@@ -730,7 +730,7 @@ mountmsdosfs(devvp, mp, p, argp)
else
pmp->pm_fmod = 1;
mp->mnt_data = (qaddr_t) pmp;
- mp->mnt_stat.f_fsid.val[0] = (long)dev;
+ mp->mnt_stat.f_fsid.val[0] = dev2udev(dev);
mp->mnt_stat.f_fsid.val[1] = mp->mnt_vfc->vfc_typenum;
mp->mnt_flag |= MNT_LOCAL;
devvp->v_specmountpoint = mp;
diff --git a/sys/gnu/ext2fs/ext2_vfsops.c b/sys/gnu/ext2fs/ext2_vfsops.c
index ffbabd1ef2b5..ed772f651caa 100644
--- a/sys/gnu/ext2fs/ext2_vfsops.c
+++ b/sys/gnu/ext2fs/ext2_vfsops.c
@@ -697,7 +697,7 @@ ext2_mountfs(devvp, mp, p)
fs->s_es->s_state &= ~EXT2_VALID_FS; /* set fs invalid */
}
mp->mnt_data = (qaddr_t)ump;
- mp->mnt_stat.f_fsid.val[0] = (long)dev;
+ mp->mnt_stat.f_fsid.val[0] = dev2udev(dev);
mp->mnt_stat.f_fsid.val[1] = mp->mnt_vfc->vfc_typenum;
mp->mnt_maxsymlinklen = EXT2_MAXSYMLINKLEN;
mp->mnt_flag |= MNT_LOCAL;
diff --git a/sys/gnu/fs/ext2fs/ext2_vfsops.c b/sys/gnu/fs/ext2fs/ext2_vfsops.c
index ffbabd1ef2b5..ed772f651caa 100644
--- a/sys/gnu/fs/ext2fs/ext2_vfsops.c
+++ b/sys/gnu/fs/ext2fs/ext2_vfsops.c
@@ -697,7 +697,7 @@ ext2_mountfs(devvp, mp, p)
fs->s_es->s_state &= ~EXT2_VALID_FS; /* set fs invalid */
}
mp->mnt_data = (qaddr_t)ump;
- mp->mnt_stat.f_fsid.val[0] = (long)dev;
+ mp->mnt_stat.f_fsid.val[0] = dev2udev(dev);
mp->mnt_stat.f_fsid.val[1] = mp->mnt_vfc->vfc_typenum;
mp->mnt_maxsymlinklen = EXT2_MAXSYMLINKLEN;
mp->mnt_flag |= MNT_LOCAL;
diff --git a/sys/isofs/cd9660/cd9660_vfsops.c b/sys/isofs/cd9660/cd9660_vfsops.c
index 3e9ada1e4080..2e007dbf73d9 100644
--- a/sys/isofs/cd9660/cd9660_vfsops.c
+++ b/sys/isofs/cd9660/cd9660_vfsops.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)cd9660_vfsops.c 8.18 (Berkeley) 5/22/95
- * $Id: cd9660_vfsops.c,v 1.57 1999/08/08 18:42:45 phk Exp $
+ * $Id: cd9660_vfsops.c,v 1.58 1999/08/13 10:29:18 phk Exp $
*/
#include <sys/param.h>
@@ -436,7 +436,7 @@ iso_mountfs(devvp, mp, p, argp)
pribp = NULL;
mp->mnt_data = (qaddr_t)isomp;
- mp->mnt_stat.f_fsid.val[0] = (long)dev;
+ mp->mnt_stat.f_fsid.val[0] = dev2udev(dev);
mp->mnt_stat.f_fsid.val[1] = mp->mnt_vfc->vfc_typenum;
mp->mnt_maxsymlinklen = 0;
mp->mnt_flag |= MNT_LOCAL;
diff --git a/sys/msdosfs/msdosfs_vfsops.c b/sys/msdosfs/msdosfs_vfsops.c
index 2729126512ca..f8c739274423 100644
--- a/sys/msdosfs/msdosfs_vfsops.c
+++ b/sys/msdosfs/msdosfs_vfsops.c
@@ -1,4 +1,4 @@
-/* $Id: msdosfs_vfsops.c,v 1.46 1999/08/08 18:42:54 phk Exp $ */
+/* $Id: msdosfs_vfsops.c,v 1.47 1999/08/13 10:29:26 phk Exp $ */
/* $NetBSD: msdosfs_vfsops.c,v 1.51 1997/11/17 15:36:58 ws Exp $ */
/*-
@@ -730,7 +730,7 @@ mountmsdosfs(devvp, mp, p, argp)
else
pmp->pm_fmod = 1;
mp->mnt_data = (qaddr_t) pmp;
- mp->mnt_stat.f_fsid.val[0] = (long)dev;
+ mp->mnt_stat.f_fsid.val[0] = dev2udev(dev);
mp->mnt_stat.f_fsid.val[1] = mp->mnt_vfc->vfc_typenum;
mp->mnt_flag |= MNT_LOCAL;
devvp->v_specmountpoint = mp;