Page MenuHomeFreeBSD
Files F106951603

D26597.diff
No OneTemporary
Actions

D26597.diff
View Options

Index: head/sys/kern/vfs_bio.c
===================================================================
--- head/sys/kern/vfs_bio.c
+++ head/sys/kern/vfs_bio.c
@@ -154,7 +154,7 @@
/* Used below and for softdep flushing threads in ufs/ffs/ffs_softdep.c */
struct proc *bufdaemonproc;
-static int inmem(struct vnode *vp, daddr_t blkno);
+static bool inmem(struct vnode *vp, daddr_t blkno);
static void vm_hold_free_pages(struct buf *bp, int newbsize);
static void vm_hold_load_pages(struct buf *bp, vm_offset_t from,
vm_offset_t to);
@@ -3586,20 +3586,21 @@
* it also hunts around in the VM system for the data.
*/
-static int
+static bool
inmem(struct vnode * vp, daddr_t blkno)
{
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,30 @@
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);
+ /*
+ * 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);
+
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;
}
- VM_OBJECT_RUNLOCK(obj);
- return 1;
-
-notinmem:
- VM_OBJECT_RUNLOCK(obj);
- return (0);
+ return (1);
}
/*

File Metadata

Mime Type
text/plain
Expires
Wed, Jan 8, 11:39 PM (4 h, 36 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15727347
Default Alt Text
D26597.diff (2 KB)

Event Timeline