| nfs_bio.c (26409) | nfs_bio.c (26469) |
|---|---|
| 1/* 2 * Copyright (c) 1989, 1993 3 * The Regents of the University of California. All rights reserved. 4 * 5 * This code is derived from software contributed to Berkeley by 6 * Rick Macklem at The University of Guelph. 7 * 8 * Redistribution and use in source and binary forms, with or without --- 20 unchanged lines hidden (view full) --- 29 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 30 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 31 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 32 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 33 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 34 * SUCH DAMAGE. 35 * 36 * @(#)nfs_bio.c 8.9 (Berkeley) 3/30/95 | 1/* 2 * Copyright (c) 1989, 1993 3 * The Regents of the University of California. All rights reserved. 4 * 5 * This code is derived from software contributed to Berkeley by 6 * Rick Macklem at The University of Guelph. 7 * 8 * Redistribution and use in source and binary forms, with or without --- 20 unchanged lines hidden (view full) --- 29 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 30 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 31 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 32 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 33 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 34 * SUCH DAMAGE. 35 * 36 * @(#)nfs_bio.c 8.9 (Berkeley) 3/30/95 |
| 37 * $Id: nfs_bio.c,v 1.38 1997/05/19 14:36:47 dfr Exp $ | 37 * $Id: nfs_bio.c,v 1.39 1997/06/03 09:42:36 dfr Exp $ |
| 38 */ 39 40 41#include <sys/param.h> 42#include <sys/systm.h> 43#include <sys/resourcevar.h> 44#include <sys/signalvar.h> 45#include <sys/proc.h> --- 397 unchanged lines hidden (view full) --- 443 vfs_unbusy_pages(rabp); 444 brelse(rabp); 445 } 446 } else { 447 brelse(rabp); 448 } 449 } 450 } | 38 */ 39 40 41#include <sys/param.h> 42#include <sys/systm.h> 43#include <sys/resourcevar.h> 44#include <sys/signalvar.h> 45#include <sys/proc.h> --- 397 unchanged lines hidden (view full) --- 443 vfs_unbusy_pages(rabp); 444 brelse(rabp); 445 } 446 } else { 447 brelse(rabp); 448 } 449 } 450 } |
| 451 n = min(uio->uio_resid, NFS_DIRBLKSIZ - bp->b_resid - on); | 451 /* 452 * Make sure we use a signed variant of min() since 453 * the second term may be negative. 454 */ 455 n = lmin(uio->uio_resid, NFS_DIRBLKSIZ - bp->b_resid - on); |
| 452 break; 453 default: 454 printf(" nfs_bioread: type %x unexpected\n",vp->v_type); 455 break; 456 }; 457 458 if (n > 0) { 459 error = uiomove(bp->b_data + on, (int)n, uio); --- 644 unchanged lines hidden --- | 456 break; 457 default: 458 printf(" nfs_bioread: type %x unexpected\n",vp->v_type); 459 break; 460 }; 461 462 if (n > 0) { 463 error = uiomove(bp->b_data + on, (int)n, uio); --- 644 unchanged lines hidden --- |