aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ext3
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ext3')
-rw-r--r--fs/ext3/super.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index b2f3715988ba..e52006737b4b 100644
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -750,7 +750,7 @@ static int ext3_release_dquot(struct dquot *dquot);
750static int ext3_mark_dquot_dirty(struct dquot *dquot); 750static int ext3_mark_dquot_dirty(struct dquot *dquot);
751static int ext3_write_info(struct super_block *sb, int type); 751static int ext3_write_info(struct super_block *sb, int type);
752static int ext3_quota_on(struct super_block *sb, int type, int format_id, 752static int ext3_quota_on(struct super_block *sb, int type, int format_id,
753 char *path, int remount); 753 char *path);
754static int ext3_quota_on_mount(struct super_block *sb, int type); 754static int ext3_quota_on_mount(struct super_block *sb, int type);
755static ssize_t ext3_quota_read(struct super_block *sb, int type, char *data, 755static ssize_t ext3_quota_read(struct super_block *sb, int type, char *data,
756 size_t len, loff_t off); 756 size_t len, loff_t off);
@@ -1529,7 +1529,7 @@ static void ext3_orphan_cleanup (struct super_block * sb,
1529 /* Turn quotas off */ 1529 /* Turn quotas off */
1530 for (i = 0; i < MAXQUOTAS; i++) { 1530 for (i = 0; i < MAXQUOTAS; i++) {
1531 if (sb_dqopt(sb)->files[i]) 1531 if (sb_dqopt(sb)->files[i])
1532 vfs_quota_off(sb, i, 0); 1532 vfs_quota_off(sb, i);
1533 } 1533 }
1534#endif 1534#endif
1535 sb->s_flags = s_flags; /* Restore MS_RDONLY status */ 1535 sb->s_flags = s_flags; /* Restore MS_RDONLY status */
@@ -2870,16 +2870,13 @@ static int ext3_quota_on_mount(struct super_block *sb, int type)
2870 * Standard function to be called on quota_on 2870 * Standard function to be called on quota_on
2871 */ 2871 */
2872static int ext3_quota_on(struct super_block *sb, int type, int format_id, 2872static int ext3_quota_on(struct super_block *sb, int type, int format_id,
2873 char *name, int remount) 2873 char *name)
2874{ 2874{
2875 int err; 2875 int err;
2876 struct path path; 2876 struct path path;
2877 2877
2878 if (!test_opt(sb, QUOTA)) 2878 if (!test_opt(sb, QUOTA))
2879 return -EINVAL; 2879 return -EINVAL;
2880 /* When remounting, no checks are needed and in fact, name is NULL */
2881 if (remount)
2882 return vfs_quota_on(sb, type, format_id, name, remount);
2883 2880
2884 err = kern_path(name, LOOKUP_FOLLOW, &path); 2881 err = kern_path(name, LOOKUP_FOLLOW, &path);
2885 if (err) 2882 if (err)