quota: kill the vfs_dq_off and vfs_dq_quota_on_remount wrappers

Instead of having wrappers in the VFS namespace export the dquot_suspend
and dquot_resume helpers directly.  Also rename vfs_quota_disable to
dquot_disable while we're at it.

[Jan Kara: Moved dquot_suspend to quotaops.h and made it inline]

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jan Kara <jack@suse.cz>

1 files changed, 4 insertions, 4 deletions

diff --git a/fs/ufs/super.c b/fs/ufs/super.c
index be1f7b05bc28..495fdc1df7eb 100644
--- a/fs/ufs/super.c
+++ b/fs/ufs/super.c
@@ -1291,11 +1291,11 @@ static int ufs_remount (struct super_block *sb, int *mount_flags, char *data)
          * fs was mouted as rw, remounting ro
          */
         if (*mount_flags & MS_RDONLY) {
-                err = vfs_dq_off(sb, 1);
-                if (err < 0 && err != -ENOSYS) {
+                err = dquot_suspend(sb, -1);
+                if (err < 0) {
                         unlock_super(sb);
                         unlock_kernel();
-                        return -EBUSY;
+                        return err;
                 }
 
                 ufs_put_super_internal(sb);
@@ -1343,7 +1343,7 @@ static int ufs_remount (struct super_block *sb, int *mount_flags, char *data)
         unlock_super(sb);
         unlock_kernel();
         if (enable_quota)
-                vfs_dq_quota_on_remount(sb);
+                dquot_resume(sb, -1);
         return 0;
 }