[XFS] remove dependency of the dmapi module on behaviors

Mount options are now parsed by the main XFS module and rejected if dmapi
support is not available, and there is a new dm operation to send the
mount event.

SGI-PV: 969608
SGI-Modid: xfs-linux-melb:xfs-kern:29502a

Signed-off-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: David Chinner <dgc@sgi.com>
Signed-off-by: Tim Shimmin <tes@sgi.com>

1 files changed, 38 insertions, 5 deletions

diff --git a/fs/xfs/xfs_dmops.c b/fs/xfs/xfs_dmops.c
index 1e4a35ddf7f9..6cd5704258a2 100644
--- a/fs/xfs/xfs_dmops.c
+++ b/fs/xfs/xfs_dmops.c
@@ -19,18 +19,51 @@
 #include "xfs_fs.h"
 #include "xfs_types.h"
 #include "xfs_log.h"
-#include "xfs_inum.h"
 #include "xfs_trans.h"
 #include "xfs_sb.h"
-#include "xfs_ag.h"
-#include "xfs_dir2.h"
 #include "xfs_dmapi.h"
+#include "xfs_inum.h"
+#include "xfs_ag.h"
 #include "xfs_mount.h"
+#include "xfs_clnt.h"
+
 
-xfs_dmops_t     xfs_dmcore_stub = {
+static struct xfs_dmops xfs_dmcore_stub = {
         .xfs_send_data          = (xfs_send_data_t)fs_nosys,
         .xfs_send_mmap          = (xfs_send_mmap_t)fs_noerr,
         .xfs_send_destroy       = (xfs_send_destroy_t)fs_nosys,
         .xfs_send_namesp        = (xfs_send_namesp_t)fs_nosys,
-        .xfs_send_unmount       = (xfs_send_unmount_t)fs_noval,
+        .xfs_send_mount         = (xfs_send_mount_t)fs_nosys,
+        .xfs_send_unmount       = (xfs_send_unmount_t)fs_noerr,
 };
+
+int
+xfs_dmops_get(struct xfs_mount *mp, struct xfs_mount_args *args)
+{
+        if (args->flags & XFSMNT_DMAPI) {
+                struct xfs_dmops *ops;
+
+                ops = symbol_get(xfs_dmcore_xfs);
+                if (!ops) {
+                        request_module("xfs_dmapi");
+                        ops = symbol_get(xfs_dmcore_xfs);
+                }
+
+                if (!ops) {
+                        cmn_err(CE_WARN, "XFS: no dmapi support available.");
+                        return EINVAL;
+                }
+                mp->m_dm_ops = ops;
+        } else {
+                mp->m_dm_ops = &xfs_dmcore_stub;
+        }
+
+        return 0;
+}
+
+void
+xfs_dmops_put(struct xfs_mount *mp)
+{
+        if (mp->m_dm_ops != &xfs_dmcore_stub)
+                symbol_put(xfs_dmcore_xfs);
+}