diff options
| author | George Wilson <George.Wilson@Sun.COM> | 2009-03-30 20:01:04 -0700 |
|---|---|---|
| committer | George Wilson <George.Wilson@Sun.COM> | 2009-03-30 20:01:04 -0700 |
| commit | 54d692b75b7a6f90ce7787309da5451f7458e66a (patch) | |
| tree | 5f5e28e24759dcca22bdf6114e90d79ae7158524 /usr/src/uts/common/fs/zfs/zfs_vfsops.c | |
| parent | 4a9df8756d3c341d4c88dbbb02d744b9cd3d3dbe (diff) | |
| download | illumos-joyent-54d692b75b7a6f90ce7787309da5451f7458e66a.tar.gz | |
6792139 recovering from a suspended pool needs some work
6794830 reboot command hangs on a failed zfs pool
Diffstat (limited to 'usr/src/uts/common/fs/zfs/zfs_vfsops.c')
| -rw-r--r-- | usr/src/uts/common/fs/zfs/zfs_vfsops.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/usr/src/uts/common/fs/zfs/zfs_vfsops.c b/usr/src/uts/common/fs/zfs/zfs_vfsops.c index c9e54fe172..4552d1f616 100644 --- a/usr/src/uts/common/fs/zfs/zfs_vfsops.c +++ b/usr/src/uts/common/fs/zfs/zfs_vfsops.c @@ -67,6 +67,8 @@ static major_t zfs_major; static minor_t zfs_minor; static kmutex_t zfs_dev_mtx; +extern int sys_shutdown; + static int zfs_mount(vfs_t *vfsp, vnode_t *mvp, struct mounta *uap, cred_t *cr); static int zfs_umount(vfs_t *vfsp, int fflag, cred_t *cr); static int zfs_mountroot(vfs_t *vfsp, enum whymountroot); @@ -145,12 +147,24 @@ zfs_sync(vfs_t *vfsp, short flag, cred_t *cr) * Sync a specific filesystem. */ zfsvfs_t *zfsvfs = vfsp->vfs_data; + dsl_pool_t *dp; ZFS_ENTER(zfsvfs); + dp = dmu_objset_pool(zfsvfs->z_os); + + /* + * If the system is shutting down, then skip any + * filesystems which may exist on a suspended pool. + */ + if (sys_shutdown && spa_suspended(dp->dp_spa)) { + ZFS_EXIT(zfsvfs); + return (0); + } + if (zfsvfs->z_log != NULL) zil_commit(zfsvfs->z_log, UINT64_MAX, 0); else - txg_wait_synced(dmu_objset_pool(zfsvfs->z_os), 0); + txg_wait_synced(dp, 0); ZFS_EXIT(zfsvfs); } else { /* |