- 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 (file)
--- 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>