d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some warnings (missing prototypes, wrong "generic" args etc)

Browse Source 
umapfs uses one of nullfs's functions...
This commit is contained in:
Peter Wemm 1997-05-25 04:50:02 +00:00
parent cee77949ec
commit e9f7506f89
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=26111
6 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/fs/nullfs/null.h
View File

@ -35,7 +35,7 @@
*
* @(#)null.h 8.3 (Berkeley) 8/20/94
*
* $Id$
* $Id: null.h,v 1.6 1997/02/22 09:40:20 peter Exp $
*/
struct null_args {
@ -70,6 +70,8 @@ extern struct vnode *null_checkvp __P((struct vnode *vp, char *fil, int lno));
#define NULLVPTOLOWERVP(vp) (VTONULL(vp)->null_lowervp)
#endif
extern int null_bypass __P((struct vop_generic_args *ap));
extern vop_t **null_vnodeop_p;
extern struct vfsops null_vfsops;
#endif /* KERNEL */

5
sys/fs/nullfs/null_vnops.c
View File

@ -37,11 +37,11 @@
*
* Ancestors:
* @(#)lofs_vnops.c 1.2 (Berkeley) 6/18/92
* $Id: null_vnops.c,v 1.16 1997/02/22 09:40:22 peter Exp $
* $Id: null_vnops.c,v 1.17 1997/04/17 11:17:30 kato Exp $
* ...and...
* @(#)null_vnodeops.c 1.20 92/07/07 UCLA Ficus project
*
* $Id: null_vnops.c,v 1.16 1997/02/22 09:40:22 peter Exp $
* $Id: null_vnops.c,v 1.17 1997/04/17 11:17:30 kato Exp $
*/
/*
@ -193,7 +193,6 @@ SYSCTL_INT(_debug, OID_AUTO, nullfs_bug_bypass, CTLFLAG_RW,
&null_bug_bypass, 0, "");
static int null_access __P((struct vop_access_args *ap));
int null_bypass __P((struct vop_generic_args *ap));
static int null_bwrite __P((struct vop_bwrite_args *ap));
static int null_getattr __P((struct vop_getattr_args *ap));
static int null_inactive __P((struct vop_inactive_args *ap));

11
sys/fs/umapfs/umap_vnops.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)umap_vnops.c 8.6 (Berkeley) 5/22/95
* $Id$
* $Id: umap_vnops.c,v 1.16 1997/02/22 09:40:38 peter Exp $
*/
/*
@ -53,6 +53,7 @@
#include <sys/malloc.h>
#include <sys/buf.h>
#include <miscfs/umapfs/umap.h>
#include <miscfs/nullfs/null.h>
static int umap_bug_bypass = 0; /* for debugging: enables bypass printf'ing */
SYSCTL_INT(_debug, OID_AUTO, umapfs_bug_bypass, CTLFLAG_RW,
@ -279,7 +280,7 @@ umap_getattr(ap)
struct vnode **vp1p;
struct vnodeop_desc *descp = ap->a_desc;
error = umap_bypass(ap);
error = umap_bypass((struct vop_generic_args *)ap);
if (error)
return (error);
/* Requires that arguments be restored. */
@ -356,7 +357,7 @@ umap_lock(ap)
if ((ap->a_flags & LK_TYPE_MASK) == LK_DRAIN)
return (0);
ap->a_flags &= ~LK_INTERLOCK;
return (null_bypass(ap));
return (null_bypass((struct vop_generic_args *)ap));
}
/*
@ -376,7 +377,7 @@ umap_unlock(ap)
vop_nounlock(ap);
ap->a_flags &= ~LK_INTERLOCK;
return (null_bypass(ap));
return (null_bypass((struct vop_generic_args *)ap));
}
static int
@ -509,7 +510,7 @@ umap_rename(ap)
printf("umap_rename: rename component credit user now %ld, group %ld\n",
compcredp->cr_uid, compcredp->cr_gid);
error = umap_bypass(ap);
error = umap_bypass((struct vop_generic_args *)ap);
/* Restore the additional mapped componentname cred structure. */

4
sys/miscfs/nullfs/null.h
View File

@ -35,7 +35,7 @@
*
* @(#)null.h 8.3 (Berkeley) 8/20/94
*
* $Id$
* $Id: null.h,v 1.6 1997/02/22 09:40:20 peter Exp $
*/
struct null_args {
@ -70,6 +70,8 @@ extern struct vnode *null_checkvp __P((struct vnode *vp, char *fil, int lno));
#define NULLVPTOLOWERVP(vp) (VTONULL(vp)->null_lowervp)
#endif
extern int null_bypass __P((struct vop_generic_args *ap));
extern vop_t **null_vnodeop_p;
extern struct vfsops null_vfsops;
#endif /* KERNEL */

5
sys/miscfs/nullfs/null_vnops.c
View File

@ -37,11 +37,11 @@
*
* Ancestors:
* @(#)lofs_vnops.c 1.2 (Berkeley) 6/18/92
* $Id: null_vnops.c,v 1.16 1997/02/22 09:40:22 peter Exp $
* $Id: null_vnops.c,v 1.17 1997/04/17 11:17:30 kato Exp $
* ...and...
* @(#)null_vnodeops.c 1.20 92/07/07 UCLA Ficus project
*
* $Id: null_vnops.c,v 1.16 1997/02/22 09:40:22 peter Exp $
* $Id: null_vnops.c,v 1.17 1997/04/17 11:17:30 kato Exp $
*/
/*
@ -193,7 +193,6 @@ SYSCTL_INT(_debug, OID_AUTO, nullfs_bug_bypass, CTLFLAG_RW,
&null_bug_bypass, 0, "");
static int null_access __P((struct vop_access_args *ap));
int null_bypass __P((struct vop_generic_args *ap));
static int null_bwrite __P((struct vop_bwrite_args *ap));
static int null_getattr __P((struct vop_getattr_args *ap));
static int null_inactive __P((struct vop_inactive_args *ap));

11
sys/miscfs/umapfs/umap_vnops.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)umap_vnops.c 8.6 (Berkeley) 5/22/95
* $Id$
* $Id: umap_vnops.c,v 1.16 1997/02/22 09:40:38 peter Exp $
*/
/*
@ -53,6 +53,7 @@
#include <sys/malloc.h>
#include <sys/buf.h>
#include <miscfs/umapfs/umap.h>
#include <miscfs/nullfs/null.h>
static int umap_bug_bypass = 0; /* for debugging: enables bypass printf'ing */
SYSCTL_INT(_debug, OID_AUTO, umapfs_bug_bypass, CTLFLAG_RW,
@ -279,7 +280,7 @@ umap_getattr(ap)
struct vnode **vp1p;
struct vnodeop_desc *descp = ap->a_desc;
error = umap_bypass(ap);
error = umap_bypass((struct vop_generic_args *)ap);
if (error)
return (error);
/* Requires that arguments be restored. */
@ -356,7 +357,7 @@ umap_lock(ap)
if ((ap->a_flags & LK_TYPE_MASK) == LK_DRAIN)
return (0);
ap->a_flags &= ~LK_INTERLOCK;
return (null_bypass(ap));
return (null_bypass((struct vop_generic_args *)ap));
}
/*
@ -376,7 +377,7 @@ umap_unlock(ap)
vop_nounlock(ap);
ap->a_flags &= ~LK_INTERLOCK;
return (null_bypass(ap));
return (null_bypass((struct vop_generic_args *)ap));
}
static int
@ -509,7 +510,7 @@ umap_rename(ap)
printf("umap_rename: rename component credit user now %ld, group %ld\n",
compcredp->cr_uid, compcredp->cr_gid);
error = umap_bypass(ap);
error = umap_bypass((struct vop_generic_args *)ap);
/* Restore the additional mapped componentname cred structure. */