[XFS] fixups after behavior removal merge into mainline git

Fixup for lack of dmapi support and no quota module support.

SGI-PV: 969985

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

diff --git a/fs/xfs/xfs_dmops.c b/fs/xfs/xfs_dmops.c
index 6cd5704258a29f1584ec63faa9a7a000e71eb05e..a1e55fb9d5dde43c95565c1aece67d4345232391 100644 (file)
--- a/fs/xfs/xfs_dmops.c
+++ b/fs/xfs/xfs_dmops.c
@@ -41,29 +41,16 @@ 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;
+               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);
 }

diff --git a/fs/xfs/xfs_qmops.c b/fs/xfs/xfs_qmops.c
index c266a0184b42e2e38eac37059a1b8ee0997dd1ab..2ec1d8a27352e6a8595af8cbaecbfc9390e16cdd 100644 (file)
--- a/fs/xfs/xfs_qmops.c
+++ b/fs/xfs/xfs_qmops.c
@@ -135,19 +135,13 @@ int
 xfs_qmops_get(struct xfs_mount *mp, struct xfs_mount_args *args)
 {
        if (args->flags & (XFSMNT_UQUOTA | XFSMNT_PQUOTA | XFSMNT_GQUOTA)) {
-               struct xfs_qmops *ops;
-
-               ops = symbol_get(xfs_qmcore_xfs);
-               if (!ops) {
-                       request_module("xfs_quota");
-                       ops = symbol_get(xfs_qmcore_xfs);
-               }
-
-               if (!ops) {
-                       cmn_err(CE_WARN, "XFS: no quota support available.");
-                       return EINVAL;
-               }
-               mp->m_qm_ops = ops;
+#ifdef CONFIG_XFS_QUOTA
+               mp->m_qm_ops = &xfs_qmcore_xfs;
+#else
+               cmn_err(CE_WARN,
+                       "XFS: qouta support not available in this kernel.");
+               return EINVAL;
+#endif
        } else {
                mp->m_qm_ops = &xfs_qmcore_stub;
        }
@@ -158,6 +152,4 @@ xfs_qmops_get(struct xfs_mount *mp, struct xfs_mount_args *args)
 void
 xfs_qmops_put(struct xfs_mount *mp)
 {
-       if (mp->m_qm_ops != &xfs_qmcore_stub)
-               symbol_put(xfs_qmcore_xfs);
 }