D2353.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D2353.diff
View Options

	Index: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h
	===================================================================
	--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h
	+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h
	@@ -261,10 +261,6 @@
	} \
	}

	-/* Called on entry to each ZFS vnode and vfs operation that can not return EIO */
	-#define ZFS_ENTER_NOERROR(zfsvfs) \
	- rrm_enter(&(zfsvfs)->z_teardown_lock, RW_READER, FTAG)
	-
	/* Must be called before exiting the vop */
	#define ZFS_EXIT(zfsvfs) rrm_exit(&(zfsvfs)->z_teardown_lock, FTAG)

	Index: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
	===================================================================
	--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
	+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
	@@ -1239,9 +1239,6 @@
	}

	vfs_mountedfrom(vfsp, osname);
	- /* Grab extra reference. */
	- VERIFY(VFS_ROOT(vfsp, LK_EXCLUSIVE, &vp) == 0);
	- VOP_UNLOCK(vp, 0);

	if (!zfsvfs->z_issnap)
	zfsctl_create(zfsvfs);
	@@ -1819,7 +1816,7 @@
	znode_t *rootzp;
	int error;

	- ZFS_ENTER_NOERROR(zfsvfs);
	+ ZFS_ENTER(zfsvfs);

	error = zfs_zget(zfsvfs, zfsvfs->z_root, &rootzp);
	if (error == 0)
	@@ -1994,7 +1991,7 @@
	/*
	* Flush all the files.
	*/
	- ret = vflush(vfsp, 1, (fflag & MS_FORCE) ? FORCECLOSE : 0, td);
	+ ret = vflush(vfsp, 0, (fflag & MS_FORCE) ? FORCECLOSE : 0, td);
	if (ret != 0) {
	if (!zfsvfs->z_issnap) {
	zfsctl_create(zfsvfs);