| ufs_bmap.c (283735) | ufs_bmap.c (297633) |
|---|---|
| 1/*- 2 * Copyright (c) 1989, 1991, 1993 3 * The Regents of the University of California. All rights reserved. 4 * (c) UNIX System Laboratories, Inc. 5 * All or some portions of this file are derived from material licensed 6 * to the University of California by American Telephone and Telegraph 7 * Co. or Unix System Laboratories, Inc. and are reproduced herein with 8 * the permission of UNIX System Laboratories, Inc. --- 21 unchanged lines hidden (view full) --- 30 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 31 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 32 * SUCH DAMAGE. 33 * 34 * @(#)ufs_bmap.c 8.7 (Berkeley) 3/21/95 35 */ 36 37#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 1989, 1991, 1993 3 * The Regents of the University of California. All rights reserved. 4 * (c) UNIX System Laboratories, Inc. 5 * All or some portions of this file are derived from material licensed 6 * to the University of California by American Telephone and Telegraph 7 * Co. or Unix System Laboratories, Inc. and are reproduced herein with 8 * the permission of UNIX System Laboratories, Inc. --- 21 unchanged lines hidden (view full) --- 30 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 31 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 32 * SUCH DAMAGE. 33 * 34 * @(#)ufs_bmap.c 8.7 (Berkeley) 3/21/95 35 */ 36 37#include <sys/cdefs.h> |
| 38__FBSDID("$FreeBSD: head/sys/ufs/ufs/ufs_bmap.c 283735 2015-05-29 13:24:17Z kib $"); | 38__FBSDID("$FreeBSD: head/sys/ufs/ufs/ufs_bmap.c 297633 2016-04-07 04:23:25Z trasz $"); |
| 39 40#include <sys/param.h> 41#include <sys/systm.h> 42#include <sys/bio.h> 43#include <sys/buf.h> 44#include <sys/proc.h> 45#include <sys/vnode.h> 46#include <sys/mount.h> | 39 40#include <sys/param.h> 41#include <sys/systm.h> 42#include <sys/bio.h> 43#include <sys/buf.h> 44#include <sys/proc.h> 45#include <sys/vnode.h> 46#include <sys/mount.h> |
| 47#include <sys/racct.h> |
|
| 47#include <sys/resourcevar.h> 48#include <sys/stat.h> 49 50#include <ufs/ufs/extattr.h> 51#include <ufs/ufs/quota.h> 52#include <ufs/ufs/inode.h> 53#include <ufs/ufs/ufsmount.h> 54#include <ufs/ufs/ufs_extern.h> --- 163 unchanged lines hidden (view full) --- 218#endif 219 bp->b_blkno = blkptrtodb(ump, daddr); 220 bp->b_iocmd = BIO_READ; 221 bp->b_flags &= ~B_INVAL; 222 bp->b_ioflags &= ~BIO_ERROR; 223 vfs_busy_pages(bp, 0); 224 bp->b_iooffset = dbtob(bp->b_blkno); 225 bstrategy(bp); | 48#include <sys/resourcevar.h> 49#include <sys/stat.h> 50 51#include <ufs/ufs/extattr.h> 52#include <ufs/ufs/quota.h> 53#include <ufs/ufs/inode.h> 54#include <ufs/ufs/ufsmount.h> 55#include <ufs/ufs/ufs_extern.h> --- 163 unchanged lines hidden (view full) --- 219#endif 220 bp->b_blkno = blkptrtodb(ump, daddr); 221 bp->b_iocmd = BIO_READ; 222 bp->b_flags &= ~B_INVAL; 223 bp->b_ioflags &= ~BIO_ERROR; 224 vfs_busy_pages(bp, 0); 225 bp->b_iooffset = dbtob(bp->b_blkno); 226 bstrategy(bp); |
| 227#ifdef RACCT 228 if (racct_enable) { 229 PROC_LOCK(curproc); 230 racct_add_buf(curproc, bp, 0); 231 PROC_UNLOCK(curproc); 232 } 233#endif /* RACCT */ |
|
| 226 curthread->td_ru.ru_inblock++; 227 error = bufwait(bp); 228 if (error) { 229 brelse(bp); 230 return (error); 231 } 232 } 233 --- 143 unchanged lines hidden --- | 234 curthread->td_ru.ru_inblock++; 235 error = bufwait(bp); 236 if (error) { 237 brelse(bp); 238 return (error); 239 } 240 } 241 --- 143 unchanged lines hidden --- |