Skip to content

Commit 7950e9a

Browse files
chaseyuJaegeuk Kim
authored and
Jaegeuk Kim
committed
f2fs: stop gc/discard thread after fs shutdown
Once filesystem shuts down, daemons like gc/discard thread should be aware of it, and do exit, in addtion, drop all cached pending discard commands and turn off real-time discard mode. Signed-off-by: Chao Yu <yuchao0@huawei.com> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
1 parent d027c48 commit 7950e9a

File tree

3 files changed

+13
-0
lines changed

3 files changed

+13
-0
lines changed

fs/f2fs/f2fs.h

+1
Original file line numberDiff line numberDiff line change
@@ -2726,6 +2726,7 @@ void invalidate_blocks(struct f2fs_sb_info *sbi, block_t addr);
27262726
bool is_checkpointed_data(struct f2fs_sb_info *sbi, block_t blkaddr);
27272727
void init_discard_policy(struct discard_policy *dpolicy, int discard_type,
27282728
unsigned int granularity);
2729+
void drop_discard_cmd(struct f2fs_sb_info *sbi);
27292730
void stop_discard_thread(struct f2fs_sb_info *sbi);
27302731
bool f2fs_wait_discard_bios(struct f2fs_sb_info *sbi);
27312732
void clear_prefree_segments(struct f2fs_sb_info *sbi, struct cp_control *cpc);

fs/f2fs/file.c

+7
Original file line numberDiff line numberDiff line change
@@ -1866,6 +1866,13 @@ static int f2fs_ioc_shutdown(struct file *filp, unsigned long arg)
18661866
ret = -EINVAL;
18671867
goto out;
18681868
}
1869+
1870+
stop_gc_thread(sbi);
1871+
stop_discard_thread(sbi);
1872+
1873+
drop_discard_cmd(sbi);
1874+
clear_opt(sbi, DISCARD);
1875+
18691876
f2fs_update_time(sbi, REQ_TIME);
18701877
out:
18711878
mnt_drop_write_file(filp);

fs/f2fs/segment.c

+5
Original file line numberDiff line numberDiff line change
@@ -1263,6 +1263,11 @@ static bool __drop_discard_cmd(struct f2fs_sb_info *sbi)
12631263
return dropped;
12641264
}
12651265

1266+
void drop_discard_cmd(struct f2fs_sb_info *sbi)
1267+
{
1268+
__drop_discard_cmd(sbi);
1269+
}
1270+
12661271
static unsigned int __wait_one_discard_bio(struct f2fs_sb_info *sbi,
12671272
struct discard_cmd *dc)
12681273
{

0 commit comments

Comments
 (0)