summaryrefslogtreecommitdiffstats
path: root/fs/ext4/ext4.h
diff options
context:
space:
mode:
authorWang Jianchao <wangjianchao@kuaishou.com>2021-08-30 15:52:46 +0800
committerTheodore Ts'o <tytso@mit.edu>2021-08-30 23:35:53 -0400
commit5036ab8df278f9879d8958679bd043e32515a3e4 (patch)
tree6faf71ad1579daab0cfca48cdac8b85388b88158 /fs/ext4/ext4.h
parent55cdd0af2bc5ffc92a2deb745627755aecd5db33 (diff)
downloadlinux-stable-5036ab8df278f9879d8958679bd043e32515a3e4.tar.gz
linux-stable-5036ab8df278f9879d8958679bd043e32515a3e4.tar.bz2
linux-stable-5036ab8df278f9879d8958679bd043e32515a3e4.zip
ext4: flush background discard kwork when retry allocation
The background discard kwork tries to mark blocks used and issue discard. This can make filesystem suffer from NOSPC error, xfstest generic/371 can fail due to it. Fix it by flushing discard kwork in ext4_should_retry_alloc. At the same time, give up discard at the moment. Signed-off-by: Wang Jianchao <wangjianchao@kuaishou.com> Link: https://lore.kernel.org/r/20210830075246.12516-6-jianchao.wan9@gmail.com Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs/ext4/ext4.h')
-rw-r--r--fs/ext4/ext4.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index 6b678b968d84..d71dcac3b97f 100644
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -1538,6 +1538,7 @@ struct ext4_sb_info {
after commit completed */
struct list_head s_discard_list;
struct work_struct s_discard_work;
+ atomic_t s_retry_alloc_pending;
struct rb_root s_mb_avg_fragment_size_root;
rwlock_t s_mb_rb_lock;
struct list_head *s_mb_largest_free_orders;