34c34
< * $FreeBSD: head/sys/security/mac_biba/mac_biba.c 168951 2007-04-22 15:31:22Z rwatson $
---
> * $FreeBSD: head/sys/security/mac_biba/mac_biba.c 168954 2007-04-22 16:18:10Z rwatson $
832c832
< struct label *mntlabel, struct label *fslabel)
---
> struct label *mntlabel)
839,840d838
< dest = SLOT(fslabel);
< mac_biba_copy_effective(source, dest);
869c867
< mac_biba_associate_vnode_devfs(struct mount *mp, struct label *fslabel,
---
> mac_biba_associate_vnode_devfs(struct mount *mp, struct label *mntlabel,
882c880
< mac_biba_associate_vnode_extattr(struct mount *mp, struct label *fslabel,
---
> mac_biba_associate_vnode_extattr(struct mount *mp, struct label *mntlabel,
888c886
< source = SLOT(fslabel);
---
> source = SLOT(mntlabel);
897c895
< /* Fall back to the fslabel. */
---
> /* Fall back to the mntlabel. */
923c921
< struct label *fslabel, struct vnode *vp, struct label *vlabel)
---
> struct label *mntlabel, struct vnode *vp, struct label *vlabel)
927c925
< source = SLOT(fslabel);
---
> source = SLOT(mntlabel);
935c933
< struct label *fslabel, struct vnode *dvp, struct label *dlabel,
---
> struct label *mntlabel, struct vnode *dvp, struct label *dlabel,
3261d3258
< .mpo_init_mount_fs_label = mac_biba_init_label,
3281d3277
< .mpo_destroy_mount_fs_label = mac_biba_destroy_label,