From: pschwan <pschwan>
Date: Fri, 4 Apr 2003 04:36:58 +0000 (+0000)
Subject: - squelch apparently-harmless "STRANGE intent release" message
X-Git-Tag: v1_7_110~2^11~154
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=6bf6aa861db86ff7fab4b5ef7d3f169074e6db13;p=fs%2Flustre-release.git

- squelch apparently-harmless "STRANGE intent release" message

- Zach's recent commit started using GPLONLY symbols, which my UML
can't resolve without a dorky preprocessor hack.  Oh well.

- Print the remote NID in timeout and "cancel out of sync" messages,
so they're useful
---

diff --git a/lustre/llite/iod.c b/lustre/llite/iod.c
index dd2ff33..1b24c49 100644
--- a/lustre/llite/iod.c
+++ b/lustre/llite/iod.c
@@ -24,6 +24,13 @@
  *  to force writeback.. the throttling in prepare_write and kupdate's usual
  *  writeback pressure got rid of our thread, but the file name remains.
  */
+
+/* UML seems to have problems with GPLONLY, in ways that I don't understand */
+#ifdef __arch_um__
+# define rb_insert_color GPLONLY_rb_insert_color
+# define rb_erase GPLONLY_rb_erase
+#endif
+
 #include <linux/version.h>
 #include <linux/config.h>
 #include <linux/module.h>