Received: by 2002:a05:6a10:16a7:0:0:0:0 with SMTP id gp39csp3441575pxb; Mon, 9 Nov 2020 11:10:57 -0800 (PST) X-Google-Smtp-Source: ABdhPJytw+PeUPPale+jKktYDDQt4c2RldwNNuhjPPOBjxW1be6skURS/Nn+IlvzKow6SmQTctQc X-Received: by 2002:a17:906:1c8f:: with SMTP id g15mr16186107ejh.179.1604949057224; Mon, 09 Nov 2020 11:10:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1604949057; cv=none; d=google.com; s=arc-20160816; b=fIU1m8UJEBjzZKazDz/5KgN9gP4sK4ne5DV6rWn2Q9+Sxe1NvQ8vIY1r9DQuVNhM4q QIZRCqg5GOom/NG2ZMel8pa6ezW00+JZiq0Vl4TKFADZE8LX8PuC7YgqlUzAflfvW7sT wibHjroNz02pZsllyYwUezUokE/cPQ77i3mKU6aiRe87Ar1NbIIDCH35H2lVyDKp17Kd jQyHzGHaMriLeNVfTC65191yUMLTAzoE+JjDdNvViXaWF2PiAaHel6M2LE+UPx0lh0Sr /Q14JVKLovh7hrpB4yI+pN6usf2yweidPw0g5jkdpXaZLM2HXssiLkAE2uNXfHwFkaRb Ijzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=u5G/50JKaYryM+sVWibc7syI36j90Ebm7qPVv/Qv5FY=; b=Wo+kVGZaJm0OgR1d0ahW+NMk7v6TO3qUjf/uDNPosQqoZzItLcVEhYmBCeaWNGlfl4 9FG8IoEJ+jJPe8T6Y7O+wCf2tB/+hgmRfnZt9f3DoKX3bJr4Vt2T2uP4LFSWVmQdGOas Bc5Q6NnhCqkMzUoPFnh/l1fzdgMfjV5raBhPn8ZEZDXRWOXpgOm74NZ/2CKZuSsRSV0b QakcwSQWrACyxOoSiw4dbN//tF319DgMKkf6fALinGHDxDBn1ZoCd6azsi2/vLpc/IP/ snKm7wLvAy1u7fEshdVQILwzXpf4jlrojxzSP/fulYqWXxQsT8yYqvy9liwAP4SZZDo2 rS9g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id i18si7531478ejg.625.2020.11.09.11.10.33; Mon, 09 Nov 2020 11:10:57 -0800 (PST) Received-SPF: pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730463AbgKITKY (ORCPT + 99 others); Mon, 9 Nov 2020 14:10:24 -0500 Received: from mx2.suse.de ([195.135.220.15]:51200 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730205AbgKITKV (ORCPT ); Mon, 9 Nov 2020 14:10:21 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id E1F1DB016; Mon, 9 Nov 2020 19:10:19 +0000 (UTC) From: Michal Suchanek To: linux-xfs@vger.kernel.org, linux-ext4@vger.kernel.org Cc: Michal Suchanek , "Theodore Ts'o" , Andreas Dilger , "Darrick J. Wong" , Ira Weiny , Jan Kara , linux-kernel@vger.kernel.org Subject: [PATCH 2/2] ext4: show the dax option in mount options Date: Mon, 9 Nov 2020 20:10:09 +0100 Message-Id: <936bf701626dfdf5b2e51186067cf5e5f5bdb282.1604948373.git.msuchanek@suse.de> X-Mailer: git-send-email 2.26.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org ext4 accepts both dax and dax_always option but shows only dax_always. Show both options. Fixes: 9cb20f94afcd ("fs/ext4: Make DAX mount option a tri-state") Signed-off-by: Michal Suchanek --- fs/ext4/super.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/ext4/super.c b/fs/ext4/super.c index ef4734b40e2a..7656c519cbe6 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -2647,7 +2647,7 @@ static int _ext4_show_options(struct seq_file *seq, struct super_block *sb, if (IS_EXT2_SB(sb)) SEQ_OPTS_PUTS("dax"); else - SEQ_OPTS_PUTS("dax=always"); + SEQ_OPTS_PUTS("dax,dax=always"); } else if (test_opt2(sb, DAX_NEVER)) { SEQ_OPTS_PUTS("dax=never"); } else if (test_opt2(sb, DAX_INODE)) { -- 2.26.2