diff options
author | mpp <mpp@FreeBSD.org> | 1997-02-12 16:31:27 +0000 |
---|---|---|
committer | mpp <mpp@FreeBSD.org> | 1997-02-12 16:31:27 +0000 |
commit | 08553db75abe8f86914b6f382444c551cf9a7f26 (patch) | |
tree | b1715b4f47e48e38c64a0e40e91921d3dd8d4abd /sys/fs | |
parent | ca6443454318b4caf5a58872e98fdcc77ab10753 (diff) | |
download | FreeBSD-src-08553db75abe8f86914b6f382444c551cf9a7f26.zip FreeBSD-src-08553db75abe8f86914b6f382444c551cf9a7f26.tar.gz |
Make this compile without warnings after the Lite2 merge:
- *fs_init routines now take a "struct vfsconf * vfsp" pointer
as an argument.
- Use the correct type for cookies.
- Update function prototypes.
Submitted by: bde
Diffstat (limited to 'sys/fs')
-rw-r--r-- | sys/fs/msdosfs/msdosfs_denode.c | 3 | ||||
-rw-r--r-- | sys/fs/msdosfs/msdosfs_vnops.c | 11 | ||||
-rw-r--r-- | sys/fs/msdosfs/msdosfsmount.h | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/sys/fs/msdosfs/msdosfs_denode.c b/sys/fs/msdosfs/msdosfs_denode.c index a891ddc..a868b66 100644 --- a/sys/fs/msdosfs/msdosfs_denode.c +++ b/sys/fs/msdosfs/msdosfs_denode.c @@ -95,7 +95,8 @@ static struct denode * static void msdosfs_hashins __P((struct denode *dep)); static void msdosfs_hashrem __P((struct denode *dep)); -int msdosfs_init() +int msdosfs_init(vfsp) + struct vfsconf *vfsp; { dehashtbl = hashinit(desiredvnodes/2, M_MSDOSFSMNT, &dehash); return 0; diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c index 0f4deae..b11ba5c 100644 --- a/sys/fs/msdosfs/msdosfs_vnops.c +++ b/sys/fs/msdosfs/msdosfs_vnops.c @@ -1525,7 +1525,7 @@ msdosfs_readdir(ap) struct uio *a_uio; struct ucred *a_cred; int *a_eofflag; - u_int *a_cookies; + u_long *a_cookies; int a_ncookies; } */ *ap; { @@ -1746,21 +1746,20 @@ out: ; struct dirent* dpStart; struct dirent* dpEnd; struct dirent* dp; - u_int *cookies; - u_int *cookiep; + u_long *cookies; + u_long *cookiep; if (uio->uio_segflg != UIO_SYSSPACE || uio->uio_iovcnt != 1) panic("msdosfs_readdir: unexpected uio from NFS server"); dpStart = (struct dirent *) (uio->uio_iov->iov_base - (uio->uio_offset - off)); dpEnd = (struct dirent *) uio->uio_iov->iov_base; - MALLOC(cookies, u_int *, ncookies * sizeof(u_int), - M_TEMP, M_WAITOK); + cookies = malloc(ncookies * sizeof(*cookies), M_TEMP, M_WAITOK); for (dp = dpStart, cookiep = cookies; dp < dpEnd; dp = (struct dirent *)((caddr_t) dp + dp->d_reclen)) { off += dp->d_reclen; - *cookiep++ = (u_int) off; + *cookiep++ = (u_long) off; } *ap->a_ncookies = ncookies; *ap->a_cookies = cookies; diff --git a/sys/fs/msdosfs/msdosfsmount.h b/sys/fs/msdosfs/msdosfsmount.h index 77c6add..44732c7 100644 --- a/sys/fs/msdosfs/msdosfsmount.h +++ b/sys/fs/msdosfs/msdosfsmount.h @@ -168,7 +168,7 @@ struct msdosfsmount { #define de_clcount(pmp, size) \ (((size) + (pmp)->pm_bpcluster - 1) >> (pmp)->pm_cnshift) -int msdosfs_init __P((void)); +int msdosfs_init __P((struct vfsconf *vfsp)); /* * Arguments to mount MSDOS filesystems. |