Commit 96c6dd59 authored May 30, 2015 by Chenxi Mao Committed by Jaegeuk Kim Jun 01, 2015

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 <chenxi.mao2013@gmail.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

parent 4683ff83

fs/f2fs/super.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -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;

Admin message