svn commit: r192209 - user/kmacy/ZFS_MFC/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Kip Macy]

Author: kmacy
Date: Sat May 16 19:54:06 2009
New Revision: 192209
URL: http://svn.freebsd.org/changeset/base/192209

Log:
  restore call to tsd_get in rrwlock.c
  eliminate white space differences with HEAD in other consumers

Modified:
  user/kmacy/ZFS_MFC/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/rrwlock.c
  user/kmacy/ZFS_MFC/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c
  user/kmacy/ZFS_MFC/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c

Modified: user/kmacy/ZFS_MFC/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/rrwlock.c
==============================================================================
--- user/kmacy/ZFS_MFC/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/rrwlock.c	Sat May 16 19:18:13 2009	(r192208)
+++ user/kmacy/ZFS_MFC/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/rrwlock.c	Sat May 16 19:54:06 2009	(r192209)
@@ -85,12 +85,11 @@ rrn_find(rrwlock_t *rrl)
 
 	if (refcount_count(&rrl->rr_linked_rcount) == 0)
 		return (NULL);
-#if 0
+
 	for (rn = tsd_get(rrw_tsd_key); rn != NULL; rn = rn->rn_next) {
 		if (rn->rn_rrl == rrl)
 			return (rn);
 	}
-#endif	
 	return (NULL);
 }
 

Modified: user/kmacy/ZFS_MFC/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c
==============================================================================
--- user/kmacy/ZFS_MFC/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c	Sat May 16 19:18:13 2009	(r192208)
+++ user/kmacy/ZFS_MFC/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c	Sat May 16 19:54:06 2009	(r192209)
@@ -451,7 +451,7 @@ zfs_log_write(zilog_t *zilog, dmu_tx_t *
 {
 	itx_wr_state_t write_state;
 	boolean_t slogging;
-	uintptr_t fsync_cnt = 0;
+	uintptr_t fsync_cnt;
 
 	if (zilog == NULL || zp->z_unlinked)
 		return;
@@ -486,6 +486,7 @@ zfs_log_write(zilog_t *zilog, dmu_tx_t *
 		write_state = WR_COPIED;
 	else
 		write_state = WR_NEED_COPY;
+
 	if ((fsync_cnt = (uintptr_t)tsd_get(zfs_fsyncer_key)) != 0) {
 		(void) tsd_set(zfs_fsyncer_key, (void *)(fsync_cnt - 1));
 	}

Modified: user/kmacy/ZFS_MFC/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
==============================================================================
--- user/kmacy/ZFS_MFC/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c	Sat May 16 19:18:13 2009	(r192208)
+++ user/kmacy/ZFS_MFC/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c	Sat May 16 19:54:06 2009	(r192209)
@@ -2299,6 +2299,7 @@ zfs_fsync(vnode_t *vp, int syncflag, cre
 	zfsvfs_t *zfsvfs = zp->z_zfsvfs;
 
 	(void) tsd_set(zfs_fsyncer_key, (void *)zfs_fsync_sync_cnt);
+
 	ZFS_ENTER(zfsvfs);
 	ZFS_VERIFY_ZP(zp);
 	zil_commit(zfsvfs->z_log, zp->z_last_itx, zp->z_id);