From 5704d2aaca084b6081cea77c4cb78e61264b0280 Mon Sep 17 00:00:00 2001
From: Donald Douwsma <donaldd@sgi.com>
Date: Tue, 22 Apr 2008 17:34:56 +1000
Subject: [PATCH] --- yaml --- r: 95007 b: refs/heads/master c:
 18d18208daced52123de9ba0808447058d3442d8 h: refs/heads/master i:   95005:
 82ef7629bb44f27599912b67d0cb46e49879ce60   95003:
 ddae75f7e0050160b12760a0d8a0f55fe048e20f   94999:
 3e6d9f5558e10960c4e8e3607c6b99b8f8e9bfed   94991:
 d8c2759555aee4b15aebbad40f3dfca7643dbddc   94975:
 fc5b720abec6e0a9dcff3c84fe5410c23aa7fe63 v: v3

---
 [refs]                             | 2 +-
 trunk/fs/xfs/linux-2.6/xfs_linux.h | 1 -
 trunk/fs/xfs/xfs.h                 | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 1a0a1813ab7d..7eb5c5d8fb54 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ce46193bcaaf3c769718bcec6eae94719b8f53ed
+refs/heads/master: 18d18208daced52123de9ba0808447058d3442d8
diff --git a/trunk/fs/xfs/linux-2.6/xfs_linux.h b/trunk/fs/xfs/linux-2.6/xfs_linux.h
index e5143323e71f..1bc9f600365f 100644
--- a/trunk/fs/xfs/linux-2.6/xfs_linux.h
+++ b/trunk/fs/xfs/linux-2.6/xfs_linux.h
@@ -99,7 +99,6 @@
 /*
  * Feature macros (disable/enable)
  */
-#define HAVE_SPLICE	/* a splice(2) exists in 2.6, but not in 2.4 */
 #ifdef CONFIG_SMP
 #define HAVE_PERCPU_SB	/* per cpu superblock counters are a 2.6 feature */
 #else
diff --git a/trunk/fs/xfs/xfs.h b/trunk/fs/xfs/xfs.h
index 765aaf65e2d3..540e4c989825 100644
--- a/trunk/fs/xfs/xfs.h
+++ b/trunk/fs/xfs/xfs.h
@@ -22,7 +22,7 @@
 #define STATIC
 #define DEBUG 1
 #define XFS_BUF_LOCK_TRACKING 1
-#define QUOTADEBUG 1
+/* #define QUOTADEBUG 1 */
 #endif
 
 #ifdef CONFIG_XFS_TRACE