diff options
Diffstat (limited to 'fs/reiserfs')
-rw-r--r-- | fs/reiserfs/super.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c index 49a8ba02bc17..5dad5a2707bc 100644 --- a/fs/reiserfs/super.c +++ b/fs/reiserfs/super.c | |||
@@ -1243,11 +1243,9 @@ static int reiserfs_remount(struct super_block *s, int *mount_flags, char *arg) | |||
1243 | /* it is read-only already */ | 1243 | /* it is read-only already */ |
1244 | goto out_ok; | 1244 | goto out_ok; |
1245 | 1245 | ||
1246 | err = vfs_dq_off(s, 1); | 1246 | err = dquot_suspend(s, -1); |
1247 | if (err < 0 && err != -ENOSYS) { | 1247 | if (err < 0) |
1248 | err = -EBUSY; | ||
1249 | goto out_err; | 1248 | goto out_err; |
1250 | } | ||
1251 | 1249 | ||
1252 | /* try to remount file system with read-only permissions */ | 1250 | /* try to remount file system with read-only permissions */ |
1253 | if (sb_umount_state(rs) == REISERFS_VALID_FS | 1251 | if (sb_umount_state(rs) == REISERFS_VALID_FS |
@@ -1302,7 +1300,7 @@ static int reiserfs_remount(struct super_block *s, int *mount_flags, char *arg) | |||
1302 | s->s_dirt = 0; | 1300 | s->s_dirt = 0; |
1303 | 1301 | ||
1304 | if (!(*mount_flags & MS_RDONLY)) { | 1302 | if (!(*mount_flags & MS_RDONLY)) { |
1305 | vfs_dq_quota_on_remount(s); | 1303 | dquot_resume(s, -1); |
1306 | finish_unfinished(s); | 1304 | finish_unfinished(s); |
1307 | reiserfs_xattr_init(s, *mount_flags); | 1305 | reiserfs_xattr_init(s, *mount_flags); |
1308 | } | 1306 | } |