diff options
| author | sl108498 <none@none> | 2006-09-20 18:19:51 -0700 |
|---|---|---|
| committer | sl108498 <none@none> | 2006-09-20 18:19:51 -0700 |
| commit | 8c12346d58d650f053c34f764af201375e89cbc6 (patch) | |
| tree | c4beee8e1a19d0fbe0a8d13407bf12fe9e050105 /usr/src | |
| parent | 9df258ac654d4990e45ba8bff1661d2d0d3b0d2a (diff) | |
| download | illumos-gate-8c12346d58d650f053c34f764af201375e89cbc6.tar.gz | |
6473101 panic: sp != NULL in seg_vn.c
6473096 swap_putpage should clear B_FORCE flag
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/uts/common/fs/swapfs/swap_vnops.c | 10 | ||||
| -rw-r--r-- | usr/src/uts/common/vm/seg_vn.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/usr/src/uts/common/fs/swapfs/swap_vnops.c b/usr/src/uts/common/fs/swapfs/swap_vnops.c index 02ae7f3212..bdcf5b8ca2 100644 --- a/usr/src/uts/common/fs/swapfs/swap_vnops.c +++ b/usr/src/uts/common/fs/swapfs/swap_vnops.c @@ -476,6 +476,11 @@ swap_putpage( ASSERT(vp->v_count != 0); + /* + * Clear force flag so that p_lckcnt pages are not invalidated. + */ + flags &= ~B_FORCE; + SWAPFS_PRINT(SWAP_VOPS, "swap_putpage: vp %p, off %llx len %lx, flags %x\n", (void *)vp, off, len, flags, 0); @@ -593,11 +598,6 @@ swap_putapage( size_t swap_klustsize; /* - * Clear force flag so that p_lckcnt pages are not invalidated. - */ - flags &= ~B_FORCE; - - /* * This check is added for callers who access swap_putpage with len = 0. * swap_putpage calls swap_putapage page-by-page via pvn_vplist_dirty. * And it's necessary to do the same queuing if users have the same diff --git a/usr/src/uts/common/vm/seg_vn.c b/usr/src/uts/common/vm/seg_vn.c index 83ef08e9f5..cf1de64089 100644 --- a/usr/src/uts/common/vm/seg_vn.c +++ b/usr/src/uts/common/vm/seg_vn.c @@ -7279,7 +7279,7 @@ segvn_lockop(struct seg *seg, caddr_t addr, size_t len, unlocked_bytes += PAGESIZE; page_unlock(pp); } else { - ASSERT(sp != NULL); + ASSERT(sp == NULL); unlocked_bytes += PAGESIZE; } VPP_CLRPPLOCK(vpp); |