aboutsummaryrefslogtreecommitdiff
path: root/sys/fs
diff options
context:
space:
mode:
Diffstat (limited to 'sys/fs')
-rw-r--r--sys/fs/cd9660/cd9660_node.c4
-rw-r--r--sys/fs/cd9660/cd9660_node.h4
-rw-r--r--sys/fs/cd9660/cd9660_rrip.c6
-rw-r--r--sys/fs/cd9660/cd9660_vnops.c4
-rw-r--r--sys/fs/coda/coda.h4
-rw-r--r--sys/fs/coda/coda_venus.c4
-rw-r--r--sys/fs/msdosfs/msdosfs_denode.c4
-rw-r--r--sys/fs/msdosfs/msdosfs_vnops.c4
-rw-r--r--sys/fs/ntfs/ntfs_ihash.c4
-rw-r--r--sys/fs/ntfs/ntfs_vfsops.c4
-rw-r--r--sys/fs/ntfs/ntfs_vnops.c6
-rw-r--r--sys/fs/specfs/spec_vnops.c4
12 files changed, 26 insertions, 26 deletions
diff --git a/sys/fs/cd9660/cd9660_node.c b/sys/fs/cd9660/cd9660_node.c
index 9640d6eed872..ea22187acb74 100644
--- a/sys/fs/cd9660/cd9660_node.c
+++ b/sys/fs/cd9660/cd9660_node.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)cd9660_node.c 8.2 (Berkeley) 1/23/94
- * $Id: cd9660_node.c,v 1.26 1999/01/02 11:34:54 bde Exp $
+ * $Id: cd9660_node.c,v 1.27 1999/01/27 21:49:54 dillon Exp $
*/
#include <sys/param.h>
@@ -57,7 +57,7 @@
*/
static struct iso_node **isohashtbl;
static u_long isohash;
-#define INOHASH(device, inum) (((device) + ((inum)>>12)) & isohash)
+#define INOHASH(device, inum) ((minor(device) + ((inum)>>12)) & isohash)
#ifndef NULL_SIMPLELOCKS
static struct simplelock cd9660_ihash_slock;
#endif
diff --git a/sys/fs/cd9660/cd9660_node.h b/sys/fs/cd9660/cd9660_node.h
index 33b208f7cbb5..46e54466fb9a 100644
--- a/sys/fs/cd9660/cd9660_node.h
+++ b/sys/fs/cd9660/cd9660_node.h
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)cd9660_node.h 8.6 (Berkeley) 5/14/95
- * $Id: cd9660_node.h,v 1.16 1997/11/18 14:40:34 phk Exp $
+ * $Id: cd9660_node.h,v 1.17 1998/02/03 21:39:30 bde Exp $
*/
/*
@@ -56,7 +56,7 @@ typedef struct {
uid_t iso_uid; /* owner user id */
gid_t iso_gid; /* owner group id */
short iso_links; /* links of file */
- dev_t iso_rdev; /* Major/Minor number for special */
+ udev_t iso_rdev; /* Major/Minor number for special */
} ISO_RRIP_INODE;
diff --git a/sys/fs/cd9660/cd9660_rrip.c b/sys/fs/cd9660/cd9660_rrip.c
index 27a57ec978c5..941435c69523 100644
--- a/sys/fs/cd9660/cd9660_rrip.c
+++ b/sys/fs/cd9660/cd9660_rrip.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)cd9660_rrip.c 8.6 (Berkeley) 12/5/94
- * $Id: cd9660_rrip.c,v 1.13 1997/08/02 14:31:19 bde Exp $
+ * $Id: cd9660_rrip.c,v 1.14 1999/04/18 10:58:01 dcs Exp $
*/
#include <sys/param.h>
@@ -423,9 +423,9 @@ cd9660_rrip_device(p,ana)
low = isonum_733(p->dev_t_low);
if (high == 0)
- ana->inop->inode.iso_rdev = makedev(major(low), minor(low));
+ ana->inop->inode.iso_rdev = umakedev(umajor(low), uminor(low));
else
- ana->inop->inode.iso_rdev = makedev(high, minor(low));
+ ana->inop->inode.iso_rdev = umakedev(high, uminor(low));
ana->fields &= ~ISO_SUSP_DEVICE;
return ISO_SUSP_DEVICE;
}
diff --git a/sys/fs/cd9660/cd9660_vnops.c b/sys/fs/cd9660/cd9660_vnops.c
index b5f9e9693098..0b07d14dadd4 100644
--- a/sys/fs/cd9660/cd9660_vnops.c
+++ b/sys/fs/cd9660/cd9660_vnops.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)cd9660_vnops.c 8.19 (Berkeley) 5/27/95
- * $Id: cd9660_vnops.c,v 1.54 1999/01/27 21:49:55 dillon Exp $
+ * $Id: cd9660_vnops.c,v 1.55 1999/04/18 10:58:02 dcs Exp $
*/
#include <sys/param.h>
@@ -210,7 +210,7 @@ cd9660_getattr(ap)
register struct vattr *vap = ap->a_vap;
register struct iso_node *ip = VTOI(vp);
- vap->va_fsid = ip->i_dev;
+ vap->va_fsid = dev2udev(ip->i_dev);
vap->va_fileid = ip->i_number;
vap->va_mode = ip->inode.iso_mode;
diff --git a/sys/fs/coda/coda.h b/sys/fs/coda/coda.h
index 7b67ea9245bd..db2ec539b003 100644
--- a/sys/fs/coda/coda.h
+++ b/sys/fs/coda/coda.h
@@ -27,7 +27,7 @@
* Mellon the rights to redistribute these changes without encumbrance.
*
* @(#) src/sys/coda/coda.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- * $Id: coda.h,v 1.5 1998/10/28 19:33:49 rvb Exp $
+ * $Id: coda.h,v 1.6 1998/11/11 20:32:20 rvb Exp $
*
*/
@@ -87,7 +87,7 @@ typedef unsigned long long u_quad_t;
typedef unsigned long long u_quad_t;
#endif
#else
-#define cdev_t dev_t
+#define cdev_t udev_t
#endif
#ifdef __CYGWIN32__
diff --git a/sys/fs/coda/coda_venus.c b/sys/fs/coda/coda_venus.c
index 96228f1737aa..11beb8d3c067 100644
--- a/sys/fs/coda/coda_venus.c
+++ b/sys/fs/coda/coda_venus.c
@@ -27,7 +27,7 @@
* Mellon the rights to redistribute these changes without encumbrance.
*
* @(#) src/sys/cfs/coda_venus.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- * $Id: coda_venus.c,v 1.5 1998/10/28 19:33:50 rvb Exp $
+ * $Id: coda_venus.c,v 1.6 1998/11/11 20:32:20 rvb Exp $
*
*/
@@ -197,7 +197,7 @@ venus_open(void *mdp, ViceFid *fid, int flag,
error = coda_call(mdp, Isize, &Osize, (char *)inp);
if (!error) {
- *dev = outp->dev;
+ *dev = udev2dev(outp->dev, 2);
*inode = outp->inode;
}
diff --git a/sys/fs/msdosfs/msdosfs_denode.c b/sys/fs/msdosfs/msdosfs_denode.c
index 74be5c4695a5..3c6f9d9179fc 100644
--- a/sys/fs/msdosfs/msdosfs_denode.c
+++ b/sys/fs/msdosfs/msdosfs_denode.c
@@ -1,4 +1,4 @@
-/* $Id: msdosfs_denode.c,v 1.43 1998/12/07 21:58:34 archie Exp $ */
+/* $Id: msdosfs_denode.c,v 1.44 1999/01/02 11:34:56 bde Exp $ */
/* $NetBSD: msdosfs_denode.c,v 1.28 1998/02/10 14:10:00 mrg Exp $ */
/*-
@@ -70,7 +70,7 @@ static MALLOC_DEFINE(M_MSDOSFSNODE, "MSDOSFS node", "MSDOSFS vnode private part"
static struct denode **dehashtbl;
static u_long dehash; /* size of hash table - 1 */
-#define DEHASH(dev, dcl, doff) (dehashtbl[((dev) + (dcl) + (doff) / \
+#define DEHASH(dev, dcl, doff) (dehashtbl[(minor(dev) + (dcl) + (doff) / \
sizeof(struct direntry)) & dehash])
#ifndef NULL_SIMPLELOCKS
static struct simplelock dehash_slock;
diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c
index e8678ab743ae..036ad2f2572d 100644
--- a/sys/fs/msdosfs/msdosfs_vnops.c
+++ b/sys/fs/msdosfs/msdosfs_vnops.c
@@ -1,4 +1,4 @@
-/* $Id: msdosfs_vnops.c,v 1.83 1999/04/28 11:37:27 phk Exp $ */
+/* $Id: msdosfs_vnops.c,v 1.84 1999/05/06 18:12:51 peter Exp $ */
/* $NetBSD: msdosfs_vnops.c,v 1.68 1998/02/10 14:10:04 mrg Exp $ */
/*-
@@ -341,7 +341,7 @@ msdosfs_getattr(ap)
getnanotime(&ts);
DETIMES(dep, &ts, &ts, &ts);
- vap->va_fsid = dep->de_dev;
+ vap->va_fsid = dev2udev(dep->de_dev);
/*
* The following computation of the fileid must be the same as that
* used in msdosfs_readdir() to compute d_fileno. If not, pwd
diff --git a/sys/fs/ntfs/ntfs_ihash.c b/sys/fs/ntfs/ntfs_ihash.c
index e75f0852f46d..ad461ea663c6 100644
--- a/sys/fs/ntfs/ntfs_ihash.c
+++ b/sys/fs/ntfs/ntfs_ihash.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)ufs_ihash.c 8.7 (Berkeley) 5/17/95
- * $Id: ntfs_ihash.c,v 1.2 1999/01/02 01:17:38 semen Exp $
+ * $Id: ntfs_ihash.c,v 1.3 1999/04/20 21:06:43 semenu Exp $
*/
#include <sys/param.h>
@@ -53,7 +53,7 @@ MALLOC_DEFINE(M_NTFSNTHASH, "NTFS nthash", "NTFS ntnode hash tables");
*/
static LIST_HEAD(nthashhead, ntnode) *ntfs_nthashtbl;
static u_long ntfs_nthash; /* size of hash table - 1 */
-#define NTNOHASH(device, inum) (&ntfs_nthashtbl[((device) + (inum)) & ntfs_nthash])
+#define NTNOHASH(device, inum) (&ntfs_nthashtbl[(minor(device) + (inum)) & ntfs_nthash])
#ifndef NULL_SIMPLELOCKS
static struct simplelock ntfs_nthash_slock;
#endif
diff --git a/sys/fs/ntfs/ntfs_vfsops.c b/sys/fs/ntfs/ntfs_vfsops.c
index c22d0637812f..fec2dcf0e522 100644
--- a/sys/fs/ntfs/ntfs_vfsops.c
+++ b/sys/fs/ntfs/ntfs_vfsops.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: ntfs_vfsops.c,v 1.3 1999/04/20 21:06:43 semenu Exp $
+ * $Id: ntfs_vfsops.c,v 1.4 1999/05/06 22:07:34 peter Exp $
*/
@@ -500,7 +500,7 @@ ntfs_mountfs(devvp, mp, argsp, p)
vput(vp);
}
- mp->mnt_stat.f_fsid.val[0] = (long)dev;
+ mp->mnt_stat.f_fsid.val[0] = dev2udev(dev);
#if __FreeBSD_version >= 300000
mp->mnt_stat.f_fsid.val[1] = mp->mnt_vfc->vfc_typenum;
#else
diff --git a/sys/fs/ntfs/ntfs_vnops.c b/sys/fs/ntfs/ntfs_vnops.c
index d22ea5fa80a3..5e0c510ad72c 100644
--- a/sys/fs/ntfs/ntfs_vnops.c
+++ b/sys/fs/ntfs/ntfs_vnops.c
@@ -33,7 +33,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: ntfs_vnops.c,v 1.10 1999/02/02 03:15:13 semen Exp $
+ * $Id: ntfs_vnops.c,v 1.3 1999/04/20 21:06:43 semenu Exp $
*
*/
@@ -215,13 +215,13 @@ ntfs_getattr(ap)
dprintf(("ntfs_getattr: %d, flags: %d\n",ip->i_number,ip->i_flag));
- vap->va_fsid = fp->f_dev;
+ vap->va_fsid = dev2udev(fp->f_dev);
vap->va_fileid = ip->i_number;
vap->va_mode = ip->i_mode;
vap->va_nlink = ip->i_nlink;
vap->va_uid = ip->i_uid;
vap->va_gid = ip->i_gid;
- vap->va_rdev = (dev_t)0;
+ vap->va_rdev = 0; /* XXX UNODEV ? */
vap->va_size = fp->f_size;
vap->va_bytes = fp->f_allocated;
vap->va_atime = ntfs_nttimetounix(fp->f_times.t_access);
diff --git a/sys/fs/specfs/spec_vnops.c b/sys/fs/specfs/spec_vnops.c
index 74c30c78d1f0..636bc4453f83 100644
--- a/sys/fs/specfs/spec_vnops.c
+++ b/sys/fs/specfs/spec_vnops.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)spec_vnops.c 8.14 (Berkeley) 5/21/95
- * $Id: spec_vnops.c,v 1.84 1999/05/07 10:11:05 phk Exp $
+ * $Id: spec_vnops.c,v 1.85 1999/05/08 06:39:55 phk Exp $
*/
#include <sys/param.h>
@@ -162,7 +162,7 @@ spec_open(ap)
{
struct proc *p = ap->a_p;
struct vnode *bvp, *vp = ap->a_vp;
- dev_t bdev, dev = (dev_t)vp->v_rdev;
+ dev_t bdev, dev = vp->v_rdev;
int maj = major(dev);
int error;
struct cdevsw *dsw;
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-09 05:24:09 +0000