f2fs: Suppress discard warning message for zoned block devices
authorDamien Le Moal <damien.lemoal@wdc.com>
Fri, 28 Oct 2016 08:45:02 +0000 (17:45 +0900)
committerJaegeuk Kim <jaegeuk@kernel.org>
Wed, 23 Nov 2016 20:11:18 +0000 (12:11 -0800)
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>
fs/f2fs/super.c

index ea3752f..56b0d2a 100644 (file)
@@ -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");