diff options
| author | Sara Hartse <sara.hartse@delphix.com> | 2016-11-29 13:15:25 -0800 |
|---|---|---|
| committer | Matthew Ahrens <mahrens@delphix.com> | 2016-12-06 11:02:46 -0800 |
| commit | 3f11de9ddb9e8b567df284c7f495ac53076611c4 (patch) | |
| tree | 8a442fe99f6ce1682086d11ad2ccaf1c13dabcfa /usr/src/uts/common/vm | |
| parent | 5bd27a4b09b84769e110128df3f77e5076d8db77 (diff) | |
| download | illumos-joyent-3f11de9ddb9e8b567df284c7f495ac53076611c4.tar.gz | |
7605 we should not attempt to write to ZFS while panicing
Reviewed by: Matt Ahrens <mahrens@delphix.com>
Reviewed by: Pavel Zakharov <pavel.zakharov@delphix.com>
Reviewed by: George Wilson <george.wilson@delphix.com>
Approved by: Dan McDonald <danmcd@omniti.com>
Diffstat (limited to 'usr/src/uts/common/vm')
| -rw-r--r-- | usr/src/uts/common/vm/vm_page.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/usr/src/uts/common/vm/vm_page.c b/usr/src/uts/common/vm/vm_page.c index dec145e446..78d1cb1a58 100644 --- a/usr/src/uts/common/vm/vm_page.c +++ b/usr/src/uts/common/vm/vm_page.c @@ -21,7 +21,7 @@ /* * Copyright (c) 1986, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2015, Josef 'Jeff' Sipek <jeffpc@josefsipek.net> - * Copyright (c) 2015 by Delphix. All rights reserved. + * Copyright (c) 2015, 2016 by Delphix. All rights reserved. */ /* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */ @@ -4299,8 +4299,6 @@ retry: return (pp); } -#define SYNC_PROGRESS_NPAGES 1000 - /* * Returns a count of dirty pages that are in the process * of being written out. If 'cleanit' is set, try to push the page. @@ -4311,21 +4309,10 @@ page_busy(int cleanit) page_t *page0 = page_first(); page_t *pp = page0; pgcnt_t nppbusy = 0; - int counter = 0; u_offset_t off; do { vnode_t *vp = pp->p_vnode; - - /* - * Reset the sync timeout. The page list is very long - * on large memory systems. - */ - if (++counter > SYNC_PROGRESS_NPAGES) { - counter = 0; - vfs_syncprogress(); - } - /* * A page is a candidate for syncing if it is: * @@ -4365,7 +4352,6 @@ page_busy(int cleanit) } } while ((pp = page_next(pp)) != page0); - vfs_syncprogress(); return (nppbusy); } |