Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  xfs: event tracing support
  xfs: change the xfs_iext_insert / xfs_iext_remove
  xfs: cleanup bmap extent state macros

1 files changed, 0 insertions, 45 deletions

diff --git a/fs/xfs/linux-2.6/xfs_lrw.h b/fs/xfs/linux-2.6/xfs_lrw.h
index e6be37dbd0e9..d1f7789c7ffb 100644
--- a/fs/xfs/linux-2.6/xfs_lrw.h
+++ b/fs/xfs/linux-2.6/xfs_lrw.h
@@ -20,52 +20,7 @@
 
 struct xfs_mount;
 struct xfs_inode;
-struct xfs_bmbt_irec;
 struct xfs_buf;
-struct xfs_iomap;
-
-#if defined(XFS_RW_TRACE)
-/*
- * Defines for the trace mechanisms in xfs_lrw.c.
- */
-#define XFS_RW_KTRACE_SIZE      128
-
-#define XFS_READ_ENTER          1
-#define XFS_WRITE_ENTER         2
-#define XFS_IOMAP_READ_ENTER    3
-#define XFS_IOMAP_WRITE_ENTER   4
-#define XFS_IOMAP_READ_MAP      5
-#define XFS_IOMAP_WRITE_MAP     6
-#define XFS_IOMAP_WRITE_NOSPACE 7
-#define XFS_ITRUNC_START        8
-#define XFS_ITRUNC_FINISH1      9
-#define XFS_ITRUNC_FINISH2      10
-#define XFS_CTRUNC1             11
-#define XFS_CTRUNC2             12
-#define XFS_CTRUNC3             13
-#define XFS_CTRUNC4             14
-#define XFS_CTRUNC5             15
-#define XFS_CTRUNC6             16
-#define XFS_BUNMAP              17
-#define XFS_INVAL_CACHED        18
-#define XFS_DIORD_ENTER         19
-#define XFS_DIOWR_ENTER         20
-#define XFS_WRITEPAGE_ENTER     22
-#define XFS_RELEASEPAGE_ENTER   23
-#define XFS_INVALIDPAGE_ENTER   24
-#define XFS_IOMAP_ALLOC_ENTER   25
-#define XFS_IOMAP_ALLOC_MAP     26
-#define XFS_IOMAP_UNWRITTEN     27
-#define XFS_SPLICE_READ_ENTER   28
-#define XFS_SPLICE_WRITE_ENTER  29
-extern void xfs_rw_enter_trace(int, struct xfs_inode *,
-                void *, size_t, loff_t, int);
-extern void xfs_inval_cached_trace(struct xfs_inode *,
-                xfs_off_t, xfs_off_t, xfs_off_t, xfs_off_t);
-#else
-#define xfs_rw_enter_trace(tag, ip, data, size, offset, ioflags)
-#define xfs_inval_cached_trace(ip, offset, len, first, last)
-#endif
 
 /* errors from xfsbdstrat() must be extracted from the buffer */
 extern void xfsbdstrat(struct xfs_mount *, struct xfs_buf *);