From patchwork Mon Nov 9 19:10:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Michal_Such=C3=A1nek?= X-Patchwork-Id: 1397064 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-ext4-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=suse.de Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4CVLDF5sdhz9sTL for ; Tue, 10 Nov 2020 06:10:21 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730388AbgKITKV (ORCPT ); Mon, 9 Nov 2020 14:10:21 -0500 Received: from mx2.suse.de ([195.135.220.15]:51158 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730189AbgKITKU (ORCPT ); Mon, 9 Nov 2020 14:10:20 -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 0809AB004; 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 1/2] xfs: show the dax option in mount options. Date: Mon, 9 Nov 2020 20:10:08 +0100 Message-Id: X-Mailer: git-send-email 2.26.2 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org xfs accepts both dax and dax_enum but shows only dax_enum. Show both options. Fixes: 8d6c3446ec23 ("fs/xfs: Make DAX mount option a tri-state") Signed-off-by: Michal Suchanek Reviewed-by: Eric Sandeen --- fs/xfs/xfs_super.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c index e3e229e52512..a3b00003840d 100644 --- a/fs/xfs/xfs_super.c +++ b/fs/xfs/xfs_super.c @@ -163,7 +163,7 @@ xfs_fs_show_options( { XFS_MOUNT_GRPID, ",grpid" }, { XFS_MOUNT_DISCARD, ",discard" }, { XFS_MOUNT_LARGEIO, ",largeio" }, - { XFS_MOUNT_DAX_ALWAYS, ",dax=always" }, + { XFS_MOUNT_DAX_ALWAYS, ",dax,dax=always" }, { XFS_MOUNT_DAX_NEVER, ",dax=never" }, { 0, NULL } }; From patchwork Mon Nov 9 19:10:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Michal_Such=C3=A1nek?= X-Patchwork-Id: 1397065 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-ext4-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=suse.de Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4CVLDK6D70z9sVq for ; Tue, 10 Nov 2020 06:10:25 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730531AbgKITKY (ORCPT ); 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 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)) {