Deleted Added
full compact
union_vfsops.c (8876) union_vfsops.c (12595)
1/*
2 * Copyright (c) 1994 The Regents of the University of California.
3 * Copyright (c) 1994 Jan-Simon Pendry.
4 * All rights reserved.
5 *
6 * This code is derived from software donated to Berkeley by
7 * Jan-Simon Pendry.
8 *

--- 21 unchanged lines hidden (view full) ---

30 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
31 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
32 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
33 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
34 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
35 * SUCH DAMAGE.
36 *
37 * @(#)union_vfsops.c 8.7 (Berkeley) 3/5/94
1/*
2 * Copyright (c) 1994 The Regents of the University of California.
3 * Copyright (c) 1994 Jan-Simon Pendry.
4 * All rights reserved.
5 *
6 * This code is derived from software donated to Berkeley by
7 * Jan-Simon Pendry.
8 *

--- 21 unchanged lines hidden (view full) ---

30 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
31 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
32 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
33 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
34 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
35 * SUCH DAMAGE.
36 *
37 * @(#)union_vfsops.c 8.7 (Berkeley) 3/5/94
38 * $Id: union_vfsops.c,v 1.9 1995/03/16 20:23:44 wollman Exp $
38 * $Id: union_vfsops.c,v 1.10 1995/05/30 08:07:26 rgrimes Exp $
39 */
40
41/*
42 * Union Layer
43 */
44
45#include <sys/param.h>
46#include <sys/systm.h>

--- 4 unchanged lines hidden (view full) ---

51#include <sys/vnode.h>
52#include <sys/mount.h>
53#include <sys/namei.h>
54#include <sys/malloc.h>
55#include <sys/filedesc.h>
56#include <sys/queue.h>
57#include <miscfs/union/union.h>
58
39 */
40
41/*
42 * Union Layer
43 */
44
45#include <sys/param.h>
46#include <sys/systm.h>

--- 4 unchanged lines hidden (view full) ---

51#include <sys/vnode.h>
52#include <sys/mount.h>
53#include <sys/namei.h>
54#include <sys/malloc.h>
55#include <sys/filedesc.h>
56#include <sys/queue.h>
57#include <miscfs/union/union.h>
58
59int union_root __P((struct mount *, struct vnode **));
60int union_statfs __P((struct mount *, struct statfs *, struct proc *));
59extern int union_init __P((void));
61
60
61extern int union_fhtovp __P((struct mount *mp, struct fid *fidp,
62 struct mbuf *nam, struct vnode **vpp,
63 int *exflagsp, struct ucred **credanonp));
64extern int union_mount __P((struct mount *mp, char *path, caddr_t data,
65 struct nameidata *ndp, struct proc *p));
66extern int union_quotactl __P((struct mount *mp, int cmd, uid_t uid,
67 caddr_t arg, struct proc *p));
68extern int union_root __P((struct mount *mp, struct vnode **vpp));
69extern int union_start __P((struct mount *mp, int flags, struct proc *p));
70extern int union_statfs __P((struct mount *mp, struct statfs *sbp,
71 struct proc *p));
72extern int union_sync __P((struct mount *mp, int waitfor,
73 struct ucred *cred, struct proc *p));
74extern int union_unmount __P((struct mount *mp, int mntflags,
75 struct proc *p));
76extern int union_vget __P((struct mount *mp, ino_t ino,
77 struct vnode **vpp));
78extern int union_vptofh __P((struct vnode *vp, struct fid *fhp));
79
62/*
63 * Mount union filesystem
64 */
65int
66union_mount(mp, path, data, ndp, p)
67 struct mount *mp;
68 char *path;
69 caddr_t data;

--- 468 unchanged lines hidden (view full) ---

538union_vptofh(vp, fhp)
539 struct vnode *vp;
540 struct fid *fhp;
541{
542
543 return (EOPNOTSUPP);
544}
545
80/*
81 * Mount union filesystem
82 */
83int
84union_mount(mp, path, data, ndp, p)
85 struct mount *mp;
86 char *path;
87 caddr_t data;

--- 468 unchanged lines hidden (view full) ---

556union_vptofh(vp, fhp)
557 struct vnode *vp;
558 struct fid *fhp;
559{
560
561 return (EOPNOTSUPP);
562}
563
546int union_init __P((void));
547
548struct vfsops union_vfsops = {
549 union_mount,
550 union_start,
551 union_unmount,
552 union_root,
553 union_quotactl,
554 union_statfs,
555 union_sync,
556 union_vget,
557 union_fhtovp,
558 union_vptofh,
559 union_init,
560};
561
562VFS_SET(union_vfsops, union, MOUNT_UNION, VFCF_LOOPBACK);
564struct vfsops union_vfsops = {
565 union_mount,
566 union_start,
567 union_unmount,
568 union_root,
569 union_quotactl,
570 union_statfs,
571 union_sync,
572 union_vget,
573 union_fhtovp,
574 union_vptofh,
575 union_init,
576};
577
578VFS_SET(union_vfsops, union, MOUNT_UNION, VFCF_LOOPBACK);