Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6

* 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6: (59 commits)
  [XFS] eagerly remove vmap mappings to avoid upsetting Xen
  [XFS] simplify validata_fields
  [XFS] no longer using io_vnode, as was remaining from 23 cherrypick
  [XFS] Remove STATIC which was missing from prior manual merge
  [XFS] Put back the QUEUE_ORDERED_NONE test in the barrier check.
  [XFS] Turn off XBF_ASYNC flag before re-reading superblock.
  [XFS] avoid race in sync_inodes() that can fail to write out all dirty data
  [XFS] This fix prevents bulkstat from spinning in an infinite loop.
  [XFS] simplify xfs_create/mknod/symlink prototype
  [XFS] avoid xfs_getattr in XFS_IOC_FSGETXATTR ioctl
  [XFS] get_bulkall() could return incorrect inode state
  [XFS] Kill unused IOMAP_EOF flag
  [XFS] fix when DMAPI mount option processing happens
  [XFS] ensure file size is logged on synchronous writes
  [XFS] growlock should be a mutex
  [XFS] replace some large xfs_log_priv.h macros by proper functions
  [XFS] kill struct bhv_vfs
  [XFS] move syncing related members from struct bhv_vfs to struct xfs_mount
  [XFS] kill the vfs_flags member in struct bhv_vfs
  [XFS] kill the vfs_fsid and vfs_altfsid members in struct bhv_vfs
  ...

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);
+}