diff options
| author | Christoph Hellwig <hch@infradead.org> | 2010-05-19 07:16:41 -0400 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2010-05-24 14:06:40 +0200 |
| commit | 0f0dd62fddcbd0f6830ed8ef3d3426ccc46b9250 (patch) | |
| tree | 295ac31b109f78873cb191867603943d8562ead0 /fs/ext2 | |
| parent | c79d967de3741ceb60c5bbbf1b6f97eab9a89838 (diff) | |
| download | linux-0f0dd62fddcbd0f6830ed8ef3d3426ccc46b9250.tar.gz | |
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/ext2')
| -rw-r--r-- | fs/ext2/super.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/ext2/super.c b/fs/ext2/super.c index 73346de9af5c..318ebc58bb7b 100644 --- a/fs/ext2/super.c +++ b/fs/ext2/super.c @@ -1250,9 +1250,8 @@ static int ext2_remount (struct super_block * sb, int * flags, char * data) es->s_mtime = cpu_to_le32(get_seconds()); spin_unlock(&sbi->s_lock); - err = vfs_dq_off(sb, 1); - if (err < 0 && err != -ENOSYS) { - err = -EBUSY; + err = dquot_suspend(sb, -1); + if (err < 0) { spin_lock(&sbi->s_lock); goto restore_opts; } @@ -1281,7 +1280,7 @@ static int ext2_remount (struct super_block * sb, int * flags, char * data) ext2_write_super(sb); - vfs_dq_quota_on_remount(sb); + dquot_resume(sb, -1); } return 0; |