Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f919b26f authored by Dmitry Monakhov's avatar Dmitry Monakhov Committed by Greg Kroah-Hartman
Browse files

quota: fix livelock in dquot_writeback_dquots 

commit 6ff33d99fc5c96797103b48b7b0902c296f09c05 upstream.

Write only quotas which are dirty at entry.

XFSTEST: https://github.com/dmonakhov/xfstests/commit/b10ad23566a5bf75832a6f500e1236084083cddc

Link: https://lore.kernel.org/r/20191031103920.3919-1-dmonakhov@openvz.org


CC: stable@vger.kernel.org
Signed-off-by: default avatarKonstantin Khlebnikov <khlebnikov@yandex-team.ru>
Signed-off-by: default avatarDmitry Monakhov <dmtrmonakhov@yandex-team.ru>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 26eca105

fs/quota/dquot.c

+5 −4
Original line number Diff line number Diff line
@@ -617,7 +617,7 @@ EXPORT_SYMBOL(dquot_scan_active); 
/* Write all dquot structures to quota files */

int dquot_writeback_dquots(struct super_block *sb, int type)

{

	struct list_head *dirty;

	struct list_head dirty;

	struct dquot *dquot;

	struct quota_info *dqopt = sb_dqopt(sb);

	int cnt;
@@ -631,9 +631,10 @@ int dquot_writeback_dquots(struct super_block *sb, int type) 
		if (!sb_has_quota_active(sb, cnt))

			continue;

		spin_lock(&dq_list_lock);

		dirty = &dqopt->info[cnt].dqi_dirty_list;

		while (!list_empty(dirty)) {

			dquot = list_first_entry(dirty, struct dquot,

		/* Move list away to avoid livelock. */

		list_replace_init(&dqopt->info[cnt].dqi_dirty_list, &dirty);

		while (!list_empty(&dirty)) {

			dquot = list_first_entry(&dirty, struct dquot,

						 dq_dirty);



			WARN_ON(!test_bit(DQ_ACTIVE_B, &dquot->dq_flags));