remove dead code, sync with kernel changes.

diff --git a/include/xfs_inode.h b/include/xfs_inode.h
index 7adfe4c6cce44f877f34c1bf1b5c675e097560de..96a470e32fff1e74f21544e76fb47b56820e0872 100644 (file)
--- a/include/xfs_inode.h
+++ b/include/xfs_inode.h
@@ -178,22 +178,12 @@ typedef struct xfs_iocore {
 
 #define IO_IS_XFS(io)  ((io)->io_flags & XFS_IOCORE_ISXFS)
 
-/*
- * Clear out the read-ahead state in the in-core inode.
- * We actually only need to clear i_next_offset and
- * i_last_req_sz to get the effect of making all the
- * read ahead state unusable.
- */
-#define XFS_INODE_CLEAR_READ_AHEAD(io) 
-
-
 /*
  * xfs_iocore prototypes
  */
 
 extern void xfs_iocore_inode_init(struct xfs_inode *);
 extern void xfs_iocore_inode_reinit(struct xfs_inode *);
-extern void xfs_iocore_reset(xfs_iocore_t *);
 
 
 /*

diff --git a/include/xfs_mount.h b/include/xfs_mount.h
index 2c859d331ce8935c505477f81bb8437501b75cc0..a588325820198339ef0a6c2215d51529907391bd 100644 (file)
--- a/include/xfs_mount.h
+++ b/include/xfs_mount.h
@@ -82,21 +82,12 @@ struct xfs_dio;
 struct xfs_bmbt_irec;
 struct xfs_bmap_free;
 
-#if defined(INTERRUPT_LATENCY_TESTING)
-#define        SPLDECL(s)             
-#define        AIL_LOCK_T              mutex_t
-#define        AIL_LOCKINIT(x,y)       mutex_init(x,MUTEX_DEFAULT, y)
-#define        AIL_LOCK_DESTROY(x)     mutex_destroy(x)
-#define        AIL_LOCK(mp,s)          mutex_lock(&(mp)->m_ail_lock, PZERO)
-#define        AIL_UNLOCK(mp,s)        mutex_unlock(&(mp)->m_ail_lock)
-#else  /* !INTERRUPT_LATENCY_TESTING */
 #define        SPLDECL(s)              int s
 #define        AIL_LOCK_T              lock_t
 #define        AIL_LOCKINIT(x,y)       spinlock_init(x,y)
 #define        AIL_LOCK_DESTROY(x)     spinlock_destroy(x)
 #define        AIL_LOCK(mp,s)          s=mutex_spinlock(&(mp)->m_ail_lock)
 #define        AIL_UNLOCK(mp,s)        mutex_spinunlock(&(mp)->m_ail_lock, s)
-#endif /* !INTERRUPT_LATENCY_TESTING */
 
 
 /* Prototypes and functions for I/O core modularization, a vector