| union_vnops.c (10093) | union_vnops.c (10551) |
|---|---|
| 1/* 2 * Copyright (c) 1992, 1993, 1994 The Regents of the University of California. 3 * Copyright (c) 1992, 1993, 1994 Jan-Simon Pendry. 4 * 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.6 (Berkeley) 2/17/94 | 1/* 2 * Copyright (c) 1992, 1993, 1994 The Regents of the University of California. 3 * Copyright (c) 1992, 1993, 1994 Jan-Simon Pendry. 4 * 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.6 (Berkeley) 2/17/94 |
| 38 * $Id: union_vnops.c,v 1.10 1995/08/01 18:50:53 davidg Exp $ | 38 * $Id: union_vnops.c,v 1.11 1995/08/17 11:53:51 bde Exp $ |
| 39 */ 40 41#include <sys/param.h> 42#include <sys/systm.h> 43#include <sys/proc.h> 44#include <sys/file.h> 45#include <sys/time.h> 46#include <sys/kernel.h> --- 1285 unchanged lines hidden (view full) --- 1332int 1333union_bmap(ap) 1334 struct vop_bmap_args /* { 1335 struct vnode *a_vp; 1336 daddr_t a_bn; 1337 struct vnode **a_vpp; 1338 daddr_t *a_bnp; 1339 int *a_runp; | 39 */ 40 41#include <sys/param.h> 42#include <sys/systm.h> 43#include <sys/proc.h> 44#include <sys/file.h> 45#include <sys/time.h> 46#include <sys/kernel.h> --- 1285 unchanged lines hidden (view full) --- 1332int 1333union_bmap(ap) 1334 struct vop_bmap_args /* { 1335 struct vnode *a_vp; 1336 daddr_t a_bn; 1337 struct vnode **a_vpp; 1338 daddr_t *a_bnp; 1339 int *a_runp; |
| 1340 int *a_runb; |
|
| 1340 } */ *ap; 1341{ 1342 int error; 1343 struct vnode *vp = OTHERVP(ap->a_vp); 1344 int dolock = (vp == LOWERVP(ap->a_vp)); 1345 1346 if (dolock) 1347 VOP_LOCK(vp); 1348 else 1349 FIXUP(VTOUNION(ap->a_vp)); | 1341 } */ *ap; 1342{ 1343 int error; 1344 struct vnode *vp = OTHERVP(ap->a_vp); 1345 int dolock = (vp == LOWERVP(ap->a_vp)); 1346 1347 if (dolock) 1348 VOP_LOCK(vp); 1349 else 1350 FIXUP(VTOUNION(ap->a_vp)); |
| 1350 error = VOP_BMAP(vp, ap->a_bn, ap->a_vpp, ap->a_bnp, ap->a_runp); | 1351 error = VOP_BMAP(vp, ap->a_bn, ap->a_vpp, ap->a_bnp, ap->a_runp, ap->a_runb); |
| 1351 if (dolock) 1352 VOP_UNLOCK(vp); 1353 1354 return (error); 1355} 1356 1357int 1358union_print(ap) --- 146 unchanged lines hidden --- | 1352 if (dolock) 1353 VOP_UNLOCK(vp); 1354 1355 return (error); 1356} 1357 1358int 1359union_print(ap) --- 146 unchanged lines hidden --- |