2010-07-21 11:36:51

by Christian Dietrich

Subject: [PATCH] fs/xfs: Remove dead CONFIG_XFS_DMAPI

CONFIG_XFS_DMAPI doesn't exist in Kconfig and is never defined anywhere
else, therefore removing all references for it from the source
code. Because XFS_DMAPI is never defined, XFS_DMAPI_STRING is always
an empty string. So we can remove all references to it.

Signed-off-by: Christian Dietrich <[email protected]>
---
fs/xfs/linux-2.6/xfs_super.h | 7 -------
1 files changed, 0 insertions(+), 7 deletions(-)

diff --git a/fs/xfs/linux-2.6/xfs_super.h b/fs/xfs/linux-2.6/xfs_super.h
index 519618e..1ef4a4d 100644
--- a/fs/xfs/linux-2.6/xfs_super.h
+++ b/fs/xfs/linux-2.6/xfs_super.h
@@ -56,12 +56,6 @@ extern void xfs_qm_exit(void);
# define XFS_BIGFS_STRING
#endif

-#ifdef CONFIG_XFS_DMAPI
-# define XFS_DMAPI_STRING "dmapi support, "
-#else
-# define XFS_DMAPI_STRING
-#endif
-
#ifdef DEBUG
# define XFS_DBG_STRING "debug"
#else
@@ -72,7 +66,6 @@ extern void xfs_qm_exit(void);
XFS_SECURITY_STRING \
XFS_REALTIME_STRING \
XFS_BIGFS_STRING \
- XFS_DMAPI_STRING \
XFS_DBG_STRING /* DBG must be last */

struct xfs_inode;
--
1.7.0.4

2010-07-21 12:19:56

by Christoph Hellwig

Subject: Re: [xfs-masters] [PATCH] fs/xfs: Remove dead CONFIG_XFS_DMAPI

On Wed, Jul 21, 2010 at 01:36:47PM +0200, Christian Dietrich wrote:
> CONFIG_XFS_DMAPI doesn't exist in Kconfig and is never defined anywhere
> else, therefore removing all references for it from the source
> code. Because XFS_DMAPI is never defined, XFS_DMAPI_STRING is always
> an empty string. So we can remove all references to it.

This code is already gone in the XFS queue for the next merge window.