diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-15 12:12:43 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-15 12:12:43 -0500 |
| commit | d180ec5d348e3a51836d723c182374483012c981 (patch) | |
| tree | 252bcf36f7f6e329d94092a3238a79d7f2e1e2e2 /fs/xfs/xfs.h | |
| parent | 53365383c4667aba55385cd1858582c19a7a8a36 (diff) | |
| parent | 0b1b213fcf3a8486ada99a2bab84ab8c6f51b264 (diff) | |
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
Diffstat (limited to 'fs/xfs/xfs.h')
| -rw-r--r-- | fs/xfs/xfs.h | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/fs/xfs/xfs.h b/fs/xfs/xfs.h index 17254b529c54..5ad8ad3a1dcd 100644 --- a/fs/xfs/xfs.h +++ b/fs/xfs/xfs.h | |||
| @@ -25,21 +25,5 @@ | |||
| 25 | /* #define QUOTADEBUG 1 */ | 25 | /* #define QUOTADEBUG 1 */ |
| 26 | #endif | 26 | #endif |
| 27 | 27 | ||
| 28 | #ifdef CONFIG_XFS_TRACE | ||
| 29 | #define XFS_ALLOC_TRACE 1 | ||
| 30 | #define XFS_ATTR_TRACE 1 | ||
| 31 | #define XFS_BLI_TRACE 1 | ||
| 32 | #define XFS_BMAP_TRACE 1 | ||
| 33 | #define XFS_BTREE_TRACE 1 | ||
| 34 | #define XFS_DIR2_TRACE 1 | ||
| 35 | #define XFS_DQUOT_TRACE 1 | ||
| 36 | #define XFS_ILOCK_TRACE 1 | ||
| 37 | #define XFS_LOG_TRACE 1 | ||
| 38 | #define XFS_RW_TRACE 1 | ||
| 39 | #define XFS_BUF_TRACE 1 | ||
| 40 | #define XFS_INODE_TRACE 1 | ||
| 41 | #define XFS_FILESTREAMS_TRACE 1 | ||
| 42 | #endif | ||
| 43 | |||
| 44 | #include <linux-2.6/xfs_linux.h> | 28 | #include <linux-2.6/xfs_linux.h> |
| 45 | #endif /* __XFS_H__ */ | 29 | #endif /* __XFS_H__ */ |