Commit 9b2ff357 authored by Jan Kara's avatar Jan Kara Committed by Theodore Ts'o
Browse files

ext4: enable quotas before orphan cleanup 



When using quota feature we need to enable quotas before orphan cleanup
so that changes happening during it are properly reflected in quota
accounting.

Signed-off-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent 262b4662

fs/ext4/super.c

+10 −10
Original line number Diff line number Diff line
@@ -3933,6 +3933,16 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) 
	if (err)

		goto failed_mount7;



#ifdef CONFIG_QUOTA

	/* Enable quota usage during mount. */

	if (EXT4_HAS_RO_COMPAT_FEATURE(sb, EXT4_FEATURE_RO_COMPAT_QUOTA) &&

	    !(sb->s_flags & MS_RDONLY)) {

		err = ext4_enable_quotas(sb);

		if (err)

			goto failed_mount8;

	}

#endif  /* CONFIG_QUOTA */



	EXT4_SB(sb)->s_mount_state |= EXT4_ORPHAN_FS;

	ext4_orphan_cleanup(sb, es);

	EXT4_SB(sb)->s_mount_state &= ~EXT4_ORPHAN_FS;
@@ -3950,16 +3960,6 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) 
	} else

		descr = "out journal";



#ifdef CONFIG_QUOTA

	/* Enable quota usage during mount. */

	if (EXT4_HAS_RO_COMPAT_FEATURE(sb, EXT4_FEATURE_RO_COMPAT_QUOTA) &&

	    !(sb->s_flags & MS_RDONLY)) {

		err = ext4_enable_quotas(sb);

		if (err)

			goto failed_mount8;

	}

#endif  /* CONFIG_QUOTA */



	if (test_opt(sb, DISCARD)) {

		struct request_queue *q = bdev_get_queue(sb->s_bdev);

		if (!blk_queue_discard(q))