Fixed the previous change. Some more code controlled by UMAPFS_DIAGNOSTIC
is actually for diagnostics; control it with DIAGNOSTIC and not DDB.
This commit is contained in:
parent
ddf3225c81
commit
622163afbe
@ -80,7 +80,7 @@ extern void umap_mapids __P((struct mount *v_mount, struct ucred *credp));
|
||||
#define MOUNTTOUMAPMOUNT(mp) ((struct umap_mount *)((mp)->mnt_data))
|
||||
#define VTOUMAP(vp) ((struct umap_node *)(vp)->v_data)
|
||||
#define UMAPTOV(xp) ((xp)->umap_vnode)
|
||||
#ifdef DDB
|
||||
#ifdef DIAGNOSTIC
|
||||
extern struct vnode *umap_checkvp __P((struct vnode *vp, char *fil, int lno));
|
||||
#define UMAPVPTOLOWERVP(vp) umap_checkvp((vp), __FILE__, __LINE__)
|
||||
#else
|
||||
|
@ -38,8 +38,6 @@
|
||||
* $FreeBSD$
|
||||
*/
|
||||
|
||||
#include "opt_ddb.h"
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/proc.h>
|
||||
@ -298,7 +296,7 @@ umap_node_create(mp, targetvp, newvpp)
|
||||
return (0);
|
||||
}
|
||||
|
||||
#ifdef DDB
|
||||
#ifdef DIAGNOSTIC
|
||||
int umap_checkvp_barrier = 1;
|
||||
struct vnode *
|
||||
umap_checkvp(vp, fil, lno)
|
||||
@ -347,7 +345,7 @@ umap_checkvp(vp, fil, lno)
|
||||
#endif
|
||||
return (a->umap_lowervp);
|
||||
}
|
||||
#endif /* DDB */
|
||||
#endif /* DIAGNOSTIC */
|
||||
|
||||
/* umap_mapids maps all of the ids in a credential, both user and group. */
|
||||
|
||||
|
@ -80,7 +80,7 @@ extern void umap_mapids __P((struct mount *v_mount, struct ucred *credp));
|
||||
#define MOUNTTOUMAPMOUNT(mp) ((struct umap_mount *)((mp)->mnt_data))
|
||||
#define VTOUMAP(vp) ((struct umap_node *)(vp)->v_data)
|
||||
#define UMAPTOV(xp) ((xp)->umap_vnode)
|
||||
#ifdef DDB
|
||||
#ifdef DIAGNOSTIC
|
||||
extern struct vnode *umap_checkvp __P((struct vnode *vp, char *fil, int lno));
|
||||
#define UMAPVPTOLOWERVP(vp) umap_checkvp((vp), __FILE__, __LINE__)
|
||||
#else
|
||||
|
@ -38,8 +38,6 @@
|
||||
* $FreeBSD$
|
||||
*/
|
||||
|
||||
#include "opt_ddb.h"
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/proc.h>
|
||||
@ -298,7 +296,7 @@ umap_node_create(mp, targetvp, newvpp)
|
||||
return (0);
|
||||
}
|
||||
|
||||
#ifdef DDB
|
||||
#ifdef DIAGNOSTIC
|
||||
int umap_checkvp_barrier = 1;
|
||||
struct vnode *
|
||||
umap_checkvp(vp, fil, lno)
|
||||
@ -347,7 +345,7 @@ umap_checkvp(vp, fil, lno)
|
||||
#endif
|
||||
return (a->umap_lowervp);
|
||||
}
|
||||
#endif /* DDB */
|
||||
#endif /* DIAGNOSTIC */
|
||||
|
||||
/* umap_mapids maps all of the ids in a credential, both user and group. */
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user