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>
This commit is contained in:

committed by
Jan Kara

parent
c79d967de3
commit
0f0dd62fdd
@@ -2598,11 +2598,9 @@ static int ext3_remount (struct super_block * sb, int * flags, char * data)
|
||||
}
|
||||
|
||||
if (*flags & MS_RDONLY) {
|
||||
err = vfs_dq_off(sb, 1);
|
||||
if (err < 0 && err != -ENOSYS) {
|
||||
err = -EBUSY;
|
||||
err = dquot_suspend(sb, -1);
|
||||
if (err < 0)
|
||||
goto restore_opts;
|
||||
}
|
||||
|
||||
/*
|
||||
* First of all, the unconditional stuff we have to do
|
||||
@@ -2672,7 +2670,7 @@ static int ext3_remount (struct super_block * sb, int * flags, char * data)
|
||||
unlock_kernel();
|
||||
|
||||
if (enable_quota)
|
||||
vfs_dq_quota_on_remount(sb);
|
||||
dquot_resume(sb, -1);
|
||||
return 0;
|
||||
restore_opts:
|
||||
sb->s_flags = old_sb_flags;
|
||||
|
Reference in New Issue
Block a user