From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C15A8C432C3 for ; Tue, 19 Nov 2019 05:42:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 936A121783 for ; Tue, 19 Nov 2019 05:42:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574142145; bh=cgb0xVVEc5WcURXKLpKTPZhyFAvDBAizIGsLfS6kJAI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=WxCzKTsPMr/fRDfavPIfvpbCesDrFTiIEIbPHXuEJtiipVEnuwoR3zcJlHcjS4wTv 0JiM2eAEJnMEMnuNbNg0Xwb/FJCPIo9mYLJ6G+jZxdnbJxqeu9RKabFnK8ZGHtWQEg US6PU9WDgSM15eaPReJJ5VmZGgAhWHnVmNicuGqk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730628AbfKSFmY (ORCPT ); Tue, 19 Nov 2019 00:42:24 -0500 Received: from mail.kernel.org ([198.145.29.99]:37094 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729307AbfKSFmW (ORCPT ); Tue, 19 Nov 2019 00:42:22 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A014721783; Tue, 19 Nov 2019 05:42:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574142141; bh=cgb0xVVEc5WcURXKLpKTPZhyFAvDBAizIGsLfS6kJAI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NwZ9mo870zC1vNZonnVT9VsYO0CQep5oIwCNweBNNGKCjAu8VEazC2eF2ocry/yxY w60CnvHG8vpAbO3cUG40ebb+FLee2jRmnNLAjxw4DILfNchhgcaKdXvayiIFkOogei tXgdeurmYik57vK3cNhz3CvFOeUKBbQntbyrP4v4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chengguang Xu , Chao Yu , Jaegeuk Kim , Sasha Levin Subject: [PATCH 4.19 362/422] f2fs: fix remount problem of option io_bits Date: Tue, 19 Nov 2019 06:19:19 +0100 Message-Id: <20191119051422.473116024@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Chengguang Xu [ Upstream commit c6b1867b1da3b1203b4c49988afeebdcbdf65499 ] Currently we show mount option "io_bits=%u" as "io_size=%uKB", it will cause option parsing problem(unrecognized mount option) in remount. Signed-off-by: Chengguang Xu Reviewed-by: Chao Yu Signed-off-by: Jaegeuk Kim Signed-off-by: Sasha Levin --- fs/f2fs/super.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index c5d28e92d146e..b05e10c332b7e 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -1336,7 +1336,8 @@ static int f2fs_show_options(struct seq_file *seq, struct dentry *root) from_kgid_munged(&init_user_ns, F2FS_OPTION(sbi).s_resgid)); if (F2FS_IO_SIZE_BITS(sbi)) - seq_printf(seq, ",io_size=%uKB", F2FS_IO_SIZE_KB(sbi)); + seq_printf(seq, ",io_bits=%u", + F2FS_OPTION(sbi).write_io_size_bits); #ifdef CONFIG_F2FS_FAULT_INJECTION if (test_opt(sbi, FAULT_INJECTION)) { seq_printf(seq, ",fault_injection=%u", -- 2.20.1