From 163f096cb6e17820c10dee77f2059b7b94952d6d Mon Sep 17 00:00:00 2001
From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Thu, 18 Dec 2008 13:24:37 -0800
Subject: [PATCH] Resolve remove shadow, rename to rm

---
 module/zfs/dmu_zfetch.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/zfs/dmu_zfetch.c b/module/zfs/dmu_zfetch.c
index 4d79fe98e1..d39b4d4b3e 100644
--- a/module/zfs/dmu_zfetch.c
+++ b/module/zfs/dmu_zfetch.c
@@ -411,7 +411,7 @@ top:
 
 	if (zs) {
 		if (reset) {
-			zstream_t *remove = zs;
+			zstream_t *rm = zs;
 
 			rc = 0;
 			mutex_exit(&zs->zst_lock);
@@ -423,7 +423,7 @@ top:
 			 */
 			for (zs = list_head(&zf->zf_stream); zs;
 			    zs = list_next(&zf->zf_stream, zs)) {
-				if (zs == remove) {
+				if (zs == rm) {
 					dmu_zfetch_stream_remove(zf, zs);
 					mutex_destroy(&zs->zst_lock);
 					kmem_free(zs, sizeof (zstream_t));