Attachment 157799 Details for Bug 180060 – proposed patch for testing

[patch] proposed patch for testing

file_180060.txt (text/plain), 1.05 KB, created by Andriy Gapon on 2015-06-16 11:25:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andriy Gapon

Created: 2015-06-16 11:25:11 UTC

Size: 1.05 KB

patch

obsolete

>diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
>index d54dc4a..4109d87 100644
>--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
>+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
>@@ -1714,9 +1714,19 @@ zfs_mount(vfs_t *vfsp)
> 	 * according to those options set in the current VFS options.
> 	 */
> 	if (vfsp->vfs_flag & MS_REMOUNT) {
>-		/* refresh mount options */
>-		zfs_unregister_callbacks(vfsp->vfs_data);
>+		zfsvfs_t *zfsvfs = vfsp->vfs_data;
>+
>+		/*
>+		 * Refresh mount options with z_teardown_lock blocking I/O while
>+		 * the filesystem is in an inconsistent state.
>+		 * The lock also serializes this code with filesystem
>+		 * manipulations between entry to zfs_suspend_fs() and return
>+		 * from zfs_resume_fs().
>+		 */
>+		rrm_enter(&zfsvfs->z_teardown_lock, RW_WRITER, FTAG);
>+		zfs_unregister_callbacks(zfsvfs);
> 		error = zfs_register_callbacks(vfsp);
>+		rrm_exit(&zfsvfs->z_teardown_lock, FTAG);
> 		goto out;
> 	}
>

Actions: View | Diff

Attachments on bug 180060: 157329 | 157799