diff options
author | Christoph Hellwig <hch@infradead.org> | 2010-05-19 07:16:41 -0400 |
---|---|---|
committer | Jan Kara <jack@suse.cz> | 2010-05-24 08:06:40 -0400 |
commit | 0f0dd62fddcbd0f6830ed8ef3d3426ccc46b9250 (patch) | |
tree | 295ac31b109f78873cb191867603943d8562ead0 /fs/udf/super.c | |
parent | c79d967de3741ceb60c5bbbf1b6f97eab9a89838 (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/udf/super.c')
-rw-r--r-- | fs/udf/super.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/udf/super.c b/fs/udf/super.c index 9ab4e259404b..b154c41a7a9a 100644 --- a/fs/udf/super.c +++ b/fs/udf/super.c | |||
@@ -590,15 +590,13 @@ static int udf_remount_fs(struct super_block *sb, int *flags, char *options) | |||
590 | if (*flags & MS_RDONLY) { | 590 | if (*flags & MS_RDONLY) { |
591 | udf_close_lvid(sb); | 591 | udf_close_lvid(sb); |
592 | 592 | ||
593 | error = vfs_dq_off(sb, 1); | 593 | error = dquot_suspend(sb, -1); |
594 | if (error < 0 && error != -ENOSYS) | ||
595 | error = -EBUSY; | ||
596 | } else { | 594 | } else { |
597 | udf_open_lvid(sb); | 595 | udf_open_lvid(sb); |
598 | 596 | ||
599 | /* mark the fs r/w for quota activity */ | 597 | /* mark the fs r/w for quota activity */ |
600 | sb->s_flags &= ~MS_RDONLY; | 598 | sb->s_flags &= ~MS_RDONLY; |
601 | vfs_dq_quota_on_remount(sb); | 599 | dquot_resume(sb, -1); |
602 | } | 600 | } |
603 | 601 | ||
604 | out_unlock: | 602 | out_unlock: |