[XFS] Remove some recent dmapi changes

SGI Modid: xfs-linux:xfs-kern:171032a

fs/xfs/linux/xfs_super.c

@@ -836,7 +836,6 @@ exit_xfs_fs( void )
 	vfs_exitquota();
 	vfs_exitdmapi();
 	unregister_filesystem(&xfs_fs_type);
-	XFS_DM_EXIT();
 	xfs_cleanup();
 	pagebuf_terminate();
 	destroy_inodecache();

fs/xfs/linux/xfs_super.h

@@ -92,12 +92,6 @@ extern void xfs_qm_exit(void);
 # define XFS_TRACE_STRING
 #endif
 
-#ifdef CONFIG_XFS_DMAPI
-# define XFS_DMAPI_STRING	"dmapi support, "
-#else
-# define XFS_DMAPI_STRING
-#endif
-
 #ifdef XFSDEBUG
 # define XFS_DBG_STRING		"debug"
 #else
@@ -109,7 +103,6 @@ extern void xfs_qm_exit(void);
 				XFS_REALTIME_STRING \
 				XFS_BIGFS_STRING \
 				XFS_TRACE_STRING \
-				XFS_DMAPI_STRING \
 				XFS_DBG_STRING /* DBG must be last */
 
 #define LINVFS_GET_VFS(s) \

fs/xfs/xfs_dmapi.h

@@ -199,14 +199,7 @@ typedef enum {
 
 extern struct bhv_vfsops xfs_dmops;
 
-#if defined(CONFIG_XFS_DMAPI) || defined(CONFIG_XFS_DMAPI_MODULE)
-void xfs_dm_init(void);
-void xfs_dm_exit(void);
-#define XFS_DM_INIT()	xfs_dm_init()
-#define XFS_DM_EXIT()	xfs_dm_exit()
-#else
-#define XFS_DM_INIT()
-#define XFS_DM_EXIT()
-#endif
+extern int dmapi_init(void);
+extern void dmapi_uninit(void);
 
 #endif  /* __XFS_DMAPI_H__ */