summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Le Moal <damien.lemoal@wdc.com>2016-10-28 17:45:02 +0900
committerJaegeuk Kim <jaegeuk@google.com>2017-09-25 15:11:39 -0700
commitecc252e7a4d71b2c4197a70f085a3c2435ff8273 (patch)
treea52cd84f85525cce7684f9736bf1bbd4fab96268
parent1529b8f943a1082e8be64d63c7206b9d72073e1a (diff)
f2fs: Suppress discard warning message for zoned block devices
commit 0ab0299835738cd407569401da1fef4c97b4419c upstream. For zoned block devices, discard is replaced by zone reset. So do not warn if the device does not supports discard. Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
-rw-r--r--fs/f2fs/super.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 4187e3b9a83e..3e57ec837de9 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -412,7 +412,7 @@ static int parse_options(struct super_block *sb, char *options)
q = bdev_get_queue(sb->s_bdev);
if (blk_queue_discard(q)) {
set_opt(sbi, DISCARD);
- } else {
+ } else if (!f2fs_sb_mounted_blkzoned(sb)) {
f2fs_msg(sb, KERN_WARNING,
"mounting with \"discard\" option, but "
"the device does not support discard");