From patchwork Thu May 10 01:45:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chengguang Xu X-Patchwork-Id: 10391037 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 387AD60540 for ; Thu, 10 May 2018 01:46:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 290D1288DA for ; Thu, 10 May 2018 01:46:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1BD1B288E4; Thu, 10 May 2018 01:46:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,FREEMAIL_FROM, MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 80972288DA for ; Thu, 10 May 2018 01:46:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756268AbeEJBqS (ORCPT ); Wed, 9 May 2018 21:46:18 -0400 Received: from mout.gmx.net ([212.227.17.20]:58983 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755614AbeEJBqR (ORCPT ); Wed, 9 May 2018 21:46:17 -0400 Received: from juanniu018037.ss.mogujie.org ([122.225.81.134]) by mail.gmx.com (mrgmx101 [212.227.17.174]) with ESMTPSA (Nemesis) id 0Mecqq-1ewsyM0xh2-00OJIy; Thu, 10 May 2018 03:46:07 +0200 From: Chengguang Xu To: clm@fb.com, jbacik@fb.com, dsterba@suse.com Cc: linux-btrfs@vger.kernel.org, Chengguang Xu Subject: [PATCH v2] btrfs: return original error code when failing from option parsing Date: Thu, 10 May 2018 09:45:55 +0800 Message-Id: <1525916755-141259-1-git-send-email-cgxu519@gmx.com> X-Mailer: git-send-email 1.8.3.1 X-Provags-ID: V03:K1:q/hhptplre4pZ6Zf+JMqRrCXOz2uv9Khr1cEgYPpAXA0NG5hDSy brLt/DEmhbSKt1AoD18wPdNB9+6NLWcFCZv7C0pg2AOV3Sr3VZQAk2aSeEz8XiAhBgr/LZb IIFqSTCRmW80Yhnt5Nr5cuLMbzVix1qBlz4AdYEgj3f1FSw8sSTv5FsiyCiiBIdqHaupr76 gNZTdeb9haKbUJhkqFhvQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:pVmnqDenGzU=:zvUKh2zA9z1aheP8bAnQ/J sWtw2GyQJFh5X66MoUcG+N8NYYeoO1MSyY/G5avay9iNeGEgCNnncoMp6cBSmuSVDwEUczeVP MO22gRxUe1Mc1AmRDAFGjNCNFiK2FKK+c1+Ddrk8b3O2DgMgQJovUK/6qGXLaRJhFYAGToUb0 NrTiMmNObdgPQKtGIuhe47tlw9T9wN0ZwwnX+7AEmekLdAWJb/9f5pG+1lClYkmnoxEu7oUiF bGxb2hbRAnZrEb0tftKu/aRCJmwVA/4IKGlXxztSs3FMqdX/tN8mC2q0k0+lDVYnv5NB+Lnfo PvMD6w9Pz79omAKXqhJTdZRl3TmdJSLSUE0xOXpXL1388WH79XqDJTIzZzlcpOtLBumn9iqYr KK8/K8WXlb8kw2Twtv9sZWXb0JcAjHWYpawsfpyXPrZ+3oL4W0XH3ENWgM854x7rYWJbHvCjX 7jOIQHvoK7j/sVL3VAHtV0kNXA5EFaxh5jkmLbd4UveBp0j5gO0xpu2Hig3nD+4gr88Wlg22V 18jRULiODjWBDnfiyEUC+uxZshrGw9mTpSkmw7k+Iy+38qUDFtDxTMlKwLWYX9ouX1M1y6rGK x+h95dqmL/HkoSGTiCSppCBmbnhjhr+57qKvcf+Zm+qu36AzmqJNHNQfi3SQMYYkJA6UQM/wk mI6Gym6u53/xwKSgWhS8N3rhU/28uR5pojysVeumZUTXwQYMA5TlVnxEMm4r3rRQHCIYO1XRf n+Bv9Yt+ha/gVmCsnJ48cjM/MGv6xJZSaQZjImsFw0zKWgfrIWaYgPH4iKE= Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP It's no good to overwrite -ENOMEM using -EINVAL when failing from mount option parsing, so just return original error code. Signed-off-by: Chengguang Xu Reviewed-by: David Sterba Reviewed-by: Qu Wenruo --- v1->v2: - Remove bracket for single line branch. fs/btrfs/super.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index 0628092..c67fafa 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -1782,10 +1782,8 @@ static int btrfs_remount(struct super_block *sb, int *flags, char *data) } ret = btrfs_parse_options(fs_info, data, *flags); - if (ret) { - ret = -EINVAL; + if (ret) goto restore; - } btrfs_remount_begin(fs_info, old_opts, *flags); btrfs_resize_thread_pool(fs_info,