aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ext4/super.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ext4/super.c')
-rw-r--r--fs/ext4/super.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 808aca3a22f5..dfe9bf503f85 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1061,7 +1061,7 @@ static int ext4_release_dquot(struct dquot *dquot);
1061static int ext4_mark_dquot_dirty(struct dquot *dquot); 1061static int ext4_mark_dquot_dirty(struct dquot *dquot);
1062static int ext4_write_info(struct super_block *sb, int type); 1062static int ext4_write_info(struct super_block *sb, int type);
1063static int ext4_quota_on(struct super_block *sb, int type, int format_id, 1063static int ext4_quota_on(struct super_block *sb, int type, int format_id,
1064 char *path, int remount); 1064 char *path);
1065static int ext4_quota_on_mount(struct super_block *sb, int type); 1065static int ext4_quota_on_mount(struct super_block *sb, int type);
1066static ssize_t ext4_quota_read(struct super_block *sb, int type, char *data, 1066static ssize_t ext4_quota_read(struct super_block *sb, int type, char *data,
1067 size_t len, loff_t off); 1067 size_t len, loff_t off);
@@ -2053,7 +2053,7 @@ static void ext4_orphan_cleanup(struct super_block *sb,
2053 /* Turn quotas off */ 2053 /* Turn quotas off */
2054 for (i = 0; i < MAXQUOTAS; i++) { 2054 for (i = 0; i < MAXQUOTAS; i++) {
2055 if (sb_dqopt(sb)->files[i]) 2055 if (sb_dqopt(sb)->files[i])
2056 vfs_quota_off(sb, i, 0); 2056 vfs_quota_off(sb, i);
2057 } 2057 }
2058#endif 2058#endif
2059 sb->s_flags = s_flags; /* Restore MS_RDONLY status */ 2059 sb->s_flags = s_flags; /* Restore MS_RDONLY status */
@@ -3924,16 +3924,13 @@ static int ext4_quota_on_mount(struct super_block *sb, int type)
3924 * Standard function to be called on quota_on 3924 * Standard function to be called on quota_on
3925 */ 3925 */
3926static int ext4_quota_on(struct super_block *sb, int type, int format_id, 3926static int ext4_quota_on(struct super_block *sb, int type, int format_id,
3927 char *name, int remount) 3927 char *name)
3928{ 3928{
3929 int err; 3929 int err;
3930 struct path path; 3930 struct path path;
3931 3931
3932 if (!test_opt(sb, QUOTA)) 3932 if (!test_opt(sb, QUOTA))
3933 return -EINVAL; 3933 return -EINVAL;
3934 /* When remounting, no checks are needed and in fact, name is NULL */
3935 if (remount)
3936 return vfs_quota_on(sb, type, format_id, name, remount);
3937 3934
3938 err = kern_path(name, LOOKUP_FOLLOW, &path); 3935 err = kern_path(name, LOOKUP_FOLLOW, &path);
3939 if (err) 3936 if (err)