Deleted Added
full compact
ext2_bmap.c (295494) ext2_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.

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

27 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
28 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
29 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
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
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.

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

27 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
28 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
29 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
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 * $FreeBSD: head/sys/fs/ext2fs/ext2_bmap.c 295494 2016-02-11 00:34:11Z pfg $
35 * $FreeBSD: head/sys/fs/ext2fs/ext2_bmap.c 297633 2016-04-07 04:23:25Z trasz $
36 */
37
38#include <sys/param.h>
39#include <sys/systm.h>
40#include <sys/bio.h>
41#include <sys/buf.h>
42#include <sys/proc.h>
43#include <sys/vnode.h>
44#include <sys/mount.h>
36 */
37
38#include <sys/param.h>
39#include <sys/systm.h>
40#include <sys/bio.h>
41#include <sys/buf.h>
42#include <sys/proc.h>
43#include <sys/vnode.h>
44#include <sys/mount.h>
45#include <sys/racct.h>
45#include <sys/resourcevar.h>
46#include <sys/stat.h>
47
48#include <fs/ext2fs/inode.h>
49#include <fs/ext2fs/fs.h>
50#include <fs/ext2fs/ext2fs.h>
51#include <fs/ext2fs/ext2_dinode.h>
52#include <fs/ext2fs/ext2_extern.h>

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

242#endif
243 bp->b_blkno = blkptrtodb(ump, daddr);
244 bp->b_iocmd = BIO_READ;
245 bp->b_flags &= ~B_INVAL;
246 bp->b_ioflags &= ~BIO_ERROR;
247 vfs_busy_pages(bp, 0);
248 bp->b_iooffset = dbtob(bp->b_blkno);
249 bstrategy(bp);
46#include <sys/resourcevar.h>
47#include <sys/stat.h>
48
49#include <fs/ext2fs/inode.h>
50#include <fs/ext2fs/fs.h>
51#include <fs/ext2fs/ext2fs.h>
52#include <fs/ext2fs/ext2_dinode.h>
53#include <fs/ext2fs/ext2_extern.h>

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

243#endif
244 bp->b_blkno = blkptrtodb(ump, daddr);
245 bp->b_iocmd = BIO_READ;
246 bp->b_flags &= ~B_INVAL;
247 bp->b_ioflags &= ~BIO_ERROR;
248 vfs_busy_pages(bp, 0);
249 bp->b_iooffset = dbtob(bp->b_blkno);
250 bstrategy(bp);
251#ifdef RACCT
252 if (racct_enable) {
253 PROC_LOCK(curproc);
254 racct_add_buf(curproc, bp, 0);
255 PROC_UNLOCK(curproc);
256 }
257#endif
250 curthread->td_ru.ru_inblock++;
251 error = bufwait(bp);
252 if (error) {
253 brelse(bp);
254 return (error);
255 }
256 }
257

--- 123 unchanged lines hidden ---
258 curthread->td_ru.ru_inblock++;
259 error = bufwait(bp);
260 if (error) {
261 brelse(bp);
262 return (error);
263 }
264 }
265

--- 123 unchanged lines hidden ---