Attachment #202317 for bug #235708

View | Details | Raw Unified | Return to bug 235708
Collapse All | Expand All

Lines 793-799 Link Here

(-)sys/vm/vnode_pager.c (-1 / +1 lines)
793		793
794	KASSERT(foff < object->un_pager.vnp.vnp_size,	794	KASSERT(foff < object->un_pager.vnp.vnp_size,
795	("%s: page %p offset beyond vp %p size", __func__, m[0], vp));	795	("%s: page %p offset beyond vp %p size", __func__, m[0], vp));
796	KASSERT(count <= sizeof(bp->b_pages),	796	KASSERT(count <= nitems(bp->b_pages),
797	("%s: requested %d pages", __func__, count));	797	("%s: requested %d pages", __func__, count));
798		798
799	/*	799	/*




static vop_fdatasync_t	ffs_fdatasync;
static vop_fsync_t	ffs_fsync;
static vop_getpages_t	ffs_getpages;
static vop_getpages_async_t	ffs_getpages_async;
static vop_lock1_t	ffs_lock;
static vop_read_t	ffs_read;
static vop_write_t	ffs_write;

	.vop_fsync =		ffs_fsync,
	.vop_fdatasync =	ffs_fdatasync,
	.vop_getpages =		ffs_getpages,
	.vop_getpages_async =	ffs_getpages_async,
	.vop_lock1 =		ffs_lock,
	.vop_read =		ffs_read,
	.vop_reallocblks =	ffs_reallocblks,

	.vop_fsync =		ffs_fsync,
	.vop_fdatasync =	ffs_fdatasync,
	.vop_getpages =		ffs_getpages,
	.vop_getpages_async =	ffs_getpages_async,
	.vop_lock1 =		ffs_lock,
	.vop_read =		ffs_read,
	.vop_reallocblks =	ffs_reallocblks,

	return (vfs_bio_getpages(vp, ap->a_m, ap->a_count, ap->a_rbehind,
	    ap->a_rahead, ffs_gbp_getblkno, ffs_gbp_getblksz));
}

static int
ffs_getpages_async(struct vop_getpages_async_args *ap)
{
	struct vnode *vp;
	struct ufsmount *um;
	int error;

	vp = ap->a_vp;
	um = VFSTOUFS(vp->v_mount);

	if (um->um_devvp->v_bufobj.bo_bsize <= PAGE_SIZE)
		return (vnode_pager_generic_getpages(vp, ap->a_m, ap->a_count,
		    ap->a_rbehind, ap->a_rahead, ap->a_iodone, ap->a_arg));

	error = vfs_bio_getpages(vp, ap->a_m, ap->a_count, ap->a_rbehind,
	    ap->a_rahead, ffs_gbp_getblkno, ffs_gbp_getblksz);
	ap->a_iodone(ap->a_arg, ap->a_m, ap->a_count, error);

	return (error);
}


Return to bug 235708

Lines 111-116 Link Here

(-)sys/ufs/ffs/ffs_vnops.c (-2 / +25 lines)
111	static vop_fdatasync_t ffs_fdatasync;	111	static vop_fdatasync_t ffs_fdatasync;
112	static vop_fsync_t ffs_fsync;	112	static vop_fsync_t ffs_fsync;
113	static vop_getpages_t ffs_getpages;	113	static vop_getpages_t ffs_getpages;
		114	static vop_getpages_async_t ffs_getpages_async;
114	static vop_lock1_t ffs_lock;	115	static vop_lock1_t ffs_lock;
115	static vop_read_t ffs_read;	116	static vop_read_t ffs_read;
116	static vop_write_t ffs_write;	117	static vop_write_t ffs_write;
Lines 132-138 Link Here
132	.vop_fsync = ffs_fsync,	133	.vop_fsync = ffs_fsync,
133	.vop_fdatasync = ffs_fdatasync,	134	.vop_fdatasync = ffs_fdatasync,
134	.vop_getpages = ffs_getpages,	135	.vop_getpages = ffs_getpages,
135	.vop_getpages_async = vnode_pager_local_getpages_async,	136	.vop_getpages_async = ffs_getpages_async,
136	.vop_lock1 = ffs_lock,	137	.vop_lock1 = ffs_lock,
137	.vop_read = ffs_read,	138	.vop_read = ffs_read,
138	.vop_reallocblks = ffs_reallocblks,	139	.vop_reallocblks = ffs_reallocblks,
Lines 154-160 Link Here
154	.vop_fsync = ffs_fsync,	155	.vop_fsync = ffs_fsync,
155	.vop_fdatasync = ffs_fdatasync,	156	.vop_fdatasync = ffs_fdatasync,
156	.vop_getpages = ffs_getpages,	157	.vop_getpages = ffs_getpages,
157	.vop_getpages_async = vnode_pager_local_getpages_async,	158	.vop_getpages_async = ffs_getpages_async,
158	.vop_lock1 = ffs_lock,	159	.vop_lock1 = ffs_lock,
159	.vop_read = ffs_read,	160	.vop_read = ffs_read,
160	.vop_reallocblks = ffs_reallocblks,	161	.vop_reallocblks = ffs_reallocblks,
Lines 1742-1744 Link Here
1742	return (vfs_bio_getpages(vp, ap->a_m, ap->a_count, ap->a_rbehind,	1743	return (vfs_bio_getpages(vp, ap->a_m, ap->a_count, ap->a_rbehind,
1743	ap->a_rahead, ffs_gbp_getblkno, ffs_gbp_getblksz));	1744	ap->a_rahead, ffs_gbp_getblkno, ffs_gbp_getblksz));
1744	}	1745	}
		1746
		1747	static int
		1748	ffs_getpages_async(struct vop_getpages_async_args *ap)
		1749	{
		1750	struct vnode *vp;
		1751	struct ufsmount *um;
		1752	int error;
		1753
		1754	vp = ap->a_vp;
		1755	um = VFSTOUFS(vp->v_mount);
		1756
		1757	if (um->um_devvp->v_bufobj.bo_bsize <= PAGE_SIZE)
		1758	return (vnode_pager_generic_getpages(vp, ap->a_m, ap->a_count,
		1759	ap->a_rbehind, ap->a_rahead, ap->a_iodone, ap->a_arg));
		1760
		1761	error = vfs_bio_getpages(vp, ap->a_m, ap->a_count, ap->a_rbehind,
		1762	ap->a_rahead, ffs_gbp_getblkno, ffs_gbp_getblksz);
		1763	ap->a_iodone(ap->a_arg, ap->a_m, ap->a_count, error);
		1764
		1765	return (error);
		1766	}
		1767