From 96c6dd59bf1d8b30afd3681550b321f4183e1914 Mon Sep 17 00:00:00 2001 From: Chenxi Mao Date: Sat, 30 May 2015 22:56:46 +0800 Subject: f2fs: disable the discard option when device doesn't support Current f2fs check the whether the blk device can support discard. However, the code will cause the discard option cannot be enabled. Because the clear_opt(sbi, DISCARD) will be invoked forever. This patch can fix this issue. Jaegeuk Kim: The original patch was intended to disable the discard option when device does not support trim command. Rather than remaining the buggy patch, let's replace with this patch as an integrated one. Signed-off-by: Chenxi Mao Signed-off-by: Jaegeuk Kim --- fs/f2fs/super.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'fs') diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index 8b5f5fb..f0be6a6 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -1237,10 +1237,12 @@ try_onemore: if (test_opt(sbi, DISCARD)) { struct request_queue *q = bdev_get_queue(sb->s_bdev); - if (!blk_queue_discard(q)) + if (!blk_queue_discard(q)) { f2fs_msg(sb, KERN_WARNING, "mounting with \"discard\" option, but " "the device does not support discard"); + clear_opt(sbi, DISCARD); + } } sbi->s_kobj.kset = f2fs_kset; -- cgit v1.1