Deleted Added
full compact
union_vnops.c (54655) union_vnops.c (58345)
1/*
2 * Copyright (c) 1992, 1993, 1994, 1995 Jan-Simon Pendry.
3 * Copyright (c) 1992, 1993, 1994, 1995
4 * The Regents of the University of California. All rights reserved.
5 *
6 * This code is derived from software contributed 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_vnops.c 8.32 (Berkeley) 6/23/95
1/*
2 * Copyright (c) 1992, 1993, 1994, 1995 Jan-Simon Pendry.
3 * Copyright (c) 1992, 1993, 1994, 1995
4 * The Regents of the University of California. All rights reserved.
5 *
6 * This code is derived from software contributed 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_vnops.c 8.32 (Berkeley) 6/23/95
38 * $FreeBSD: head/sys/fs/unionfs/union_vnops.c 54655 1999-12-15 23:02:35Z eivind $
38 * $FreeBSD: head/sys/fs/unionfs/union_vnops.c 58345 2000-03-20 10:44:49Z phk $
39 */
40
41#include <sys/param.h>
42#include <sys/systm.h>
43#include <sys/proc.h>
44#include <sys/fcntl.h>
45#include <sys/stat.h>
46#include <sys/kernel.h>

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

1918 } */ *ap;
1919{
1920 struct buf *bp = ap->a_bp;
1921 struct vnode *othervp = OTHERVP(bp->b_vp);
1922
1923#ifdef DIAGNOSTIC
1924 if (othervp == NULLVP)
1925 panic("union_strategy: nil vp");
39 */
40
41#include <sys/param.h>
42#include <sys/systm.h>
43#include <sys/proc.h>
44#include <sys/fcntl.h>
45#include <sys/stat.h>
46#include <sys/kernel.h>

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

1918 } */ *ap;
1919{
1920 struct buf *bp = ap->a_bp;
1921 struct vnode *othervp = OTHERVP(bp->b_vp);
1922
1923#ifdef DIAGNOSTIC
1924 if (othervp == NULLVP)
1925 panic("union_strategy: nil vp");
1926 if (((bp->b_flags & B_READ) == 0) &&
1926 if ((bp->b_iocmd == BIO_WRITE) &&
1927 (othervp == LOWERVP(bp->b_vp)))
1928 panic("union_strategy: writing to lowervp");
1929#endif
1930 return (VOP_STRATEGY(othervp, bp));
1931}
1932
1933/*
1934 * Global vfs data structures

--- 47 unchanged lines hidden ---
1927 (othervp == LOWERVP(bp->b_vp)))
1928 panic("union_strategy: writing to lowervp");
1929#endif
1930 return (VOP_STRATEGY(othervp, bp));
1931}
1932
1933/*
1934 * Global vfs data structures

--- 47 unchanged lines hidden ---