Merge branches 'release', 'asus', 'bugzilla-12450', 'cpuidle', 'debug', 'ec', 'misc...

[~andy/linux] / fs / xfs / xfs_dmops.c

diff --git a/fs/xfs/xfs_dmops.c b/fs/xfs/xfs_dmops.c
index 6cd5704258a29f1584ec63faa9a7a000e71eb05e..e71e2581c0c34b7e3febea7b907d41c5b82c979d 100644 (file)
--- a/fs/xfs/xfs_dmops.c
+++ b/fs/xfs/xfs_dmops.c
@@ -25,7 +25,6 @@
 #include "xfs_inum.h"
 #include "xfs_ag.h"
 #include "xfs_mount.h"
-#include "xfs_clnt.h"
 
 
 static struct xfs_dmops xfs_dmcore_stub = {
@@ -38,32 +37,19 @@ static struct xfs_dmops xfs_dmcore_stub = {
 };
 
 int
-xfs_dmops_get(struct xfs_mount *mp, struct xfs_mount_args *args)
+xfs_dmops_get(struct xfs_mount *mp)
 {
-       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;
+       if (mp->m_flags & XFS_MOUNT_DMAPI) {
+               cmn_err(CE_WARN,
+                       "XFS: dmapi support not available in this kernel.");
+               return EINVAL;
        }
 
+       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);
 }