aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/super.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@infradead.org>2010-05-19 07:16:43 -0400
committerJan Kara <jack@suse.cz>2010-05-24 08:09:12 -0400
commit307ae18a56e5b706056a2050d52e8cc01b5171c0 (patch)
treec4efc57bb8f0fd1d2aa9e416d81c0c7ba87aaf22 /fs/ocfs2/super.c
parente0ccfd959cd8907bcb66cc2042e0f4fd7fcbff2b (diff)
quota: drop remount argument to ->quota_on and ->quota_off
Remount handling has fully moved into the filesystem, so all this is superflous now. 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.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
index 0773873d590..5367d6dee39 100644
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
@@ -964,7 +964,7 @@ static void ocfs2_disable_quotas(struct ocfs2_super *osb)
964 964
965/* Handle quota on quotactl */ 965/* Handle quota on quotactl */
966static int ocfs2_quota_on(struct super_block *sb, int type, int format_id, 966static int ocfs2_quota_on(struct super_block *sb, int type, int format_id,
967 char *path, int remount) 967 char *path)
968{ 968{
969 unsigned int feature[MAXQUOTAS] = { OCFS2_FEATURE_RO_COMPAT_USRQUOTA, 969 unsigned int feature[MAXQUOTAS] = { OCFS2_FEATURE_RO_COMPAT_USRQUOTA,
970 OCFS2_FEATURE_RO_COMPAT_GRPQUOTA}; 970 OCFS2_FEATURE_RO_COMPAT_GRPQUOTA};
@@ -972,19 +972,13 @@ static int ocfs2_quota_on(struct super_block *sb, int type, int format_id,
972 if (!OCFS2_HAS_RO_COMPAT_FEATURE(sb, feature[type])) 972 if (!OCFS2_HAS_RO_COMPAT_FEATURE(sb, feature[type]))
973 return -EINVAL; 973 return -EINVAL;
974 974
975 if (remount)
976 return 0; /* Just ignore it has been handled in
977 * ocfs2_remount() */
978 return vfs_quota_enable(sb_dqopt(sb)->files[type], type, 975 return vfs_quota_enable(sb_dqopt(sb)->files[type], type,
979 format_id, DQUOT_LIMITS_ENABLED); 976 format_id, DQUOT_LIMITS_ENABLED);
980} 977}
981 978
982/* Handle quota off quotactl */ 979/* Handle quota off quotactl */
983static int ocfs2_quota_off(struct super_block *sb, int type, int remount) 980static int ocfs2_quota_off(struct super_block *sb, int type)
984{ 981{
985 if (remount)
986 return 0; /* Ignore now and handle later in
987 * ocfs2_remount() */
988 return dquot_disable(sb, type, DQUOT_LIMITS_ENABLED); 982 return dquot_disable(sb, type, DQUOT_LIMITS_ENABLED);
989} 983}
990 984