diff options
| author | Poul-Henning Kamp <phk@FreeBSD.org> | 1999-05-11 19:55:07 +0000 |
|---|---|---|
| committer | Poul-Henning Kamp <phk@FreeBSD.org> | 1999-05-11 19:55:07 +0000 |
| commit | bfbb9ce67005673c7b7c8b2267024adef44f7d1d (patch) | |
| tree | 9ffcbddb82416102ac7aed6b4c9c9b5bf02d13e3 /sys/ntfs | |
| parent | ac9a7ff18c4b3ed2974b52ffccdddff73dfd5cad (diff) | |
Notes
Diffstat (limited to 'sys/ntfs')
| -rw-r--r-- | sys/ntfs/ntfs_ihash.c | 4 | ||||
| -rw-r--r-- | sys/ntfs/ntfs_vfsops.c | 4 | ||||
| -rw-r--r-- | sys/ntfs/ntfs_vnops.c | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sys/ntfs/ntfs_ihash.c b/sys/ntfs/ntfs_ihash.c index e75f0852f46d..ad461ea663c6 100644 --- a/sys/ntfs/ntfs_ihash.c +++ b/sys/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/ntfs/ntfs_vfsops.c b/sys/ntfs/ntfs_vfsops.c index c22d0637812f..fec2dcf0e522 100644 --- a/sys/ntfs/ntfs_vfsops.c +++ b/sys/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/ntfs/ntfs_vnops.c b/sys/ntfs/ntfs_vnops.c index d22ea5fa80a3..5e0c510ad72c 100644 --- a/sys/ntfs/ntfs_vnops.c +++ b/sys/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); |