aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/super.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@infradead.org>2010-05-19 07:16:41 -0400
committerJan Kara <jack@suse.cz>2010-05-24 08:06:40 -0400
commit0f0dd62fddcbd0f6830ed8ef3d3426ccc46b9250 (patch)
tree295ac31b109f78873cb191867603943d8562ead0 /fs/ocfs2/super.c
parentc79d967de3741ceb60c5bbbf1b6f97eab9a89838 (diff)
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>
Diffstat (limited to 'fs/ocfs2/super.c')
-rw-r--r--fs/ocfs2/super.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
index 66f9984a983..0773873d590 100644
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
@@ -879,18 +879,14 @@ static int ocfs2_susp_quotas(struct ocfs2_super *osb, int unsuspend)
879 if (!OCFS2_HAS_RO_COMPAT_FEATURE(sb, feature[type])) 879 if (!OCFS2_HAS_RO_COMPAT_FEATURE(sb, feature[type]))
880 continue; 880 continue;
881 if (unsuspend) 881 if (unsuspend)
882 status = vfs_quota_enable( 882 status = dquot_resume(sb, type);
883 sb_dqopt(sb)->files[type],
884 type, QFMT_OCFS2,
885 DQUOT_SUSPENDED);
886 else { 883 else {
887 struct ocfs2_mem_dqinfo *oinfo; 884 struct ocfs2_mem_dqinfo *oinfo;
888 885
889 /* Cancel periodic syncing before suspending */ 886 /* Cancel periodic syncing before suspending */
890 oinfo = sb_dqinfo(sb, type)->dqi_priv; 887 oinfo = sb_dqinfo(sb, type)->dqi_priv;
891 cancel_delayed_work_sync(&oinfo->dqi_sync_work); 888 cancel_delayed_work_sync(&oinfo->dqi_sync_work);
892 status = vfs_quota_disable(sb, type, 889 status = dquot_suspend(sb, type);
893 DQUOT_SUSPENDED);
894 } 890 }
895 if (status < 0) 891 if (status < 0)
896 break; 892 break;
@@ -958,8 +954,8 @@ static void ocfs2_disable_quotas(struct ocfs2_super *osb)
958 /* Turn off quotas. This will remove all dquot structures from 954 /* Turn off quotas. This will remove all dquot structures from
959 * memory and so they will be automatically synced to global 955 * memory and so they will be automatically synced to global
960 * quota files */ 956 * quota files */
961 vfs_quota_disable(sb, type, DQUOT_USAGE_ENABLED | 957 dquot_disable(sb, type, DQUOT_USAGE_ENABLED |
962 DQUOT_LIMITS_ENABLED); 958 DQUOT_LIMITS_ENABLED);
963 if (!inode) 959 if (!inode)
964 continue; 960 continue;
965 iput(inode); 961 iput(inode);
@@ -989,7 +985,7 @@ static int ocfs2_quota_off(struct super_block *sb, int type, int remount)
989 if (remount) 985 if (remount)
990 return 0; /* Ignore now and handle later in 986 return 0; /* Ignore now and handle later in
991 * ocfs2_remount() */ 987 * ocfs2_remount() */
992 return vfs_quota_disable(sb, type, DQUOT_LIMITS_ENABLED); 988 return dquot_disable(sb, type, DQUOT_LIMITS_ENABLED);
993} 989}
994 990
995static const struct quotactl_ops ocfs2_quotactl_ops = { 991static const struct quotactl_ops ocfs2_quotactl_ops = {