1 files changed, 38 insertions, 2 deletions

diff --git a/fs/xfs/xfs_qmops.c b/fs/xfs/xfs_qmops.c
index 0d594ed7efef..c266a0184b42 100644
--- a/fs/xfs/xfs_qmops.c
+++ b/fs/xfs/xfs_qmops.c
@@ -28,6 +28,8 @@
 #include "xfs_mount.h"
 #include "xfs_quota.h"
 #include "xfs_error.h"
+#include "xfs_clnt.h"
+
 
 STATIC struct xfs_dquot *
 xfs_dqvopchown_default(
@@ -64,7 +66,7 @@ xfs_mount_reset_sbqflags(xfs_mount_t *mp)
          * if the fs is readonly, let the incore superblock run
          * with quotas off but don't flush the update out to disk
          */
-        if (XFS_MTOVFS(mp)->vfs_flag & VFS_RDONLY)
+        if (mp->m_flags & XFS_MOUNT_RDONLY)
                 return 0;
 #ifdef QUOTADEBUG
         xfs_fs_cmn_err(CE_NOTE, mp, "Writing superblock quota changes");
@@ -110,7 +112,7 @@ xfs_noquota_init(
         return error;
 }
 
-xfs_qmops_t     xfs_qmcore_stub = {
+static struct xfs_qmops xfs_qmcore_stub = {
         .xfs_qminit             = (xfs_qminit_t) xfs_noquota_init,
         .xfs_qmdone             = (xfs_qmdone_t) fs_noerr,
         .xfs_qmmount            = (xfs_qmmount_t) fs_noerr,
@@ -124,4 +126,38 @@ xfs_qmops_t	xfs_qmcore_stub = {
         .xfs_dqvoprename        = (xfs_dqvoprename_t) fs_noerr,
         .xfs_dqvopchown         = xfs_dqvopchown_default,
         .xfs_dqvopchownresv     = (xfs_dqvopchownresv_t) fs_noerr,
+        .xfs_dqstatvfs          = (xfs_dqstatvfs_t) fs_noval,
+        .xfs_dqsync             = (xfs_dqsync_t) fs_noerr,
+        .xfs_quotactl           = (xfs_quotactl_t) fs_nosys,
 };
+
+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;
+        } else {
+                mp->m_qm_ops = &xfs_qmcore_stub;
+        }
+
+        return 0;
+}
+
+void
+xfs_qmops_put(struct xfs_mount *mp)
+{
+        if (mp->m_qm_ops != &xfs_qmcore_stub)
+                symbol_put(xfs_qmcore_xfs);
+}