D26597.id77684.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D26597.id77684.diff
View Options

	Index: sys/kern/vfs_bio.c
	===================================================================
	--- sys/kern/vfs_bio.c
	+++ sys/kern/vfs_bio.c
	@@ -3591,15 +3591,16 @@
	{
	vm_object_t obj;
	vm_offset_t toff, tinc, size;
	- vm_page_t m;
	+ vm_page_t m, n;
	vm_ooffset_t off;
	+ int valid;

	ASSERT_VOP_LOCKED(vp, "inmem");

	if (incore(&vp->v_bufobj, blkno))
	- return 1;
	+ return (1);
	if (vp->v_mount == NULL)
	- return 0;
	+ return (0);
	obj = vp->v_object;
	if (obj == NULL)
	return (0);
	@@ -3609,24 +3610,29 @@
	size = vp->v_mount->mnt_stat.f_iosize;
	off = (vm_ooffset_t)blkno * (vm_ooffset_t)vp->v_mount->mnt_stat.f_iosize;

	- VM_OBJECT_RLOCK(obj);
	for (toff = 0; toff < vp->v_mount->mnt_stat.f_iosize; toff += tinc) {
	- m = vm_page_lookup(obj, OFF_TO_IDX(off + toff));
	- if (!m)
	- goto notinmem;
	+ m = vm_page_lookup_unlocked(obj, OFF_TO_IDX(off + toff));
	+recheck:
	+ if (m == NULL)
	+ return (0);
	tinc = size;
	if (tinc > PAGE_SIZE - ((toff + off) & PAGE_MASK))
	tinc = PAGE_SIZE - ((toff + off) & PAGE_MASK);
	- if (vm_page_is_valid(m,
	- (vm_offset_t) ((toff + off) & PAGE_MASK), tinc) == 0)
	- goto notinmem;
	+ /*
	+ * Consider page validity only if page mapping didn't change
	+ * during the check.
	+ */
	+ valid = vm_page_is_valid(m,
	+ (vm_offset_t)((toff + off) & PAGE_MASK), tinc);
	+ n = vm_page_lookup_unlocked(obj, OFF_TO_IDX(off + toff));
	+ if (m != n) {
	+ m = n;
	+ goto recheck;
	+ }
	+ if (!valid)
	+ return (0);
	}
	- VM_OBJECT_RUNLOCK(obj);
	- return 1;
	-
	-notinmem:
	- VM_OBJECT_RUNLOCK(obj);
	- return (0);
	+ return (1);
	}

	/*