From patchwork Mon Oct 8 19:32:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Sandeen X-Patchwork-Id: 980766 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; 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=sandeen.net Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42TVrg08JPz9sBh for ; Tue, 9 Oct 2018 06:33:07 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726592AbeJICqX (ORCPT ); Mon, 8 Oct 2018 22:46:23 -0400 Received: from sandeen.net ([63.231.237.45]:39898 "EHLO sandeen.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726522AbeJICqX (ORCPT ); Mon, 8 Oct 2018 22:46:23 -0400 Received: by sandeen.net (Postfix, from userid 500) id 10D6054F; Mon, 8 Oct 2018 14:32:52 -0500 (CDT) From: Eric Sandeen To: linux-xfs@vger.kernel.org, linux-ext4@vger.kernel.org Subject: [PATCH 1/3] xfs: hard fail dax mount on unsupported devices Date: Mon, 8 Oct 2018 14:32:47 -0500 Message-Id: <1539027169-23332-2-git-send-email-sandeen@sandeen.net> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1539027169-23332-1-git-send-email-sandeen@sandeen.net> References: <1539027169-23332-1-git-send-email-sandeen@sandeen.net> Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org As dax inches closer to production use, an administrator should not be surprised by silently disabling the feature they asked for. Signed-off-by: Eric Sandeen Reviewed-by: Dave Chinner --- fs/xfs/xfs_super.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c index 207ee30..a0a32cd 100644 --- a/fs/xfs/xfs_super.c +++ b/fs/xfs/xfs_super.c @@ -1674,9 +1674,9 @@ struct proc_xfs_info { rtdev_is_dax = bdev_dax_supported( mp->m_rtdev_targp->bt_bdev, sb->s_blocksize); if (!rtdev_is_dax && !datadev_is_dax) { - xfs_alert(mp, - "DAX unsupported by block device. Turning off DAX."); - mp->m_flags &= ~XFS_MOUNT_DAX; + xfs_alert(mp, "DAX unsupported by block device."); + error = -EINVAL; + goto out_filestream_unmount; } if (xfs_sb_version_hasreflink(&mp->m_sb)) { xfs_alert(mp, From patchwork Mon Oct 8 19:32:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Sandeen X-Patchwork-Id: 980765 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; 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=sandeen.net Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42TVrf27KZz9sB7 for ; Tue, 9 Oct 2018 06:33:06 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726613AbeJICqY (ORCPT ); Mon, 8 Oct 2018 22:46:24 -0400 Received: from sandeen.net ([63.231.237.45]:39900 "EHLO sandeen.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726523AbeJICqX (ORCPT ); Mon, 8 Oct 2018 22:46:23 -0400 Received: by sandeen.net (Postfix, from userid 500) id 2136EB6A; Mon, 8 Oct 2018 14:32:52 -0500 (CDT) From: Eric Sandeen To: linux-xfs@vger.kernel.org, linux-ext4@vger.kernel.org Subject: [PATCH 2/3] ext4: hard fail dax mount on unsupported devices Date: Mon, 8 Oct 2018 14:32:48 -0500 Message-Id: <1539027169-23332-3-git-send-email-sandeen@sandeen.net> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1539027169-23332-1-git-send-email-sandeen@sandeen.net> References: <1539027169-23332-1-git-send-email-sandeen@sandeen.net> Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org As dax inches closer to production use, an administrator should not be surprised by silently disabling the feature they asked for. Signed-off-by: Eric Sandeen --- fs/ext4/super.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 5863fd2..bf0bea5 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -3821,12 +3821,12 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) if (ext4_has_feature_inline_data(sb)) { ext4_msg(sb, KERN_ERR, "Cannot use DAX on a filesystem" " that may contain inline data"); - sbi->s_mount_opt &= ~EXT4_MOUNT_DAX; + goto failed_mount; } if (!bdev_dax_supported(sb->s_bdev, blocksize)) { ext4_msg(sb, KERN_ERR, - "DAX unsupported by block device. Turning off DAX."); - sbi->s_mount_opt &= ~EXT4_MOUNT_DAX; + "DAX unsupported by block device."); + goto failed_mount; } } From patchwork Mon Oct 8 19:32:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Sandeen X-Patchwork-Id: 980767 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; 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=sandeen.net Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42TVrg5ccrz9sD2 for ; Tue, 9 Oct 2018 06:33:07 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726616AbeJICqZ (ORCPT ); Mon, 8 Oct 2018 22:46:25 -0400 Received: from sandeen.net ([63.231.237.45]:39902 "EHLO sandeen.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726540AbeJICqX (ORCPT ); Mon, 8 Oct 2018 22:46:23 -0400 Received: by sandeen.net (Postfix, from userid 500) id 3DEB722C7; Mon, 8 Oct 2018 14:32:52 -0500 (CDT) From: Eric Sandeen To: linux-xfs@vger.kernel.org, linux-ext4@vger.kernel.org Subject: [PATCH 3/3] ext2: hard fail dax mount on unsupported devices Date: Mon, 8 Oct 2018 14:32:49 -0500 Message-Id: <1539027169-23332-4-git-send-email-sandeen@sandeen.net> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1539027169-23332-1-git-send-email-sandeen@sandeen.net> References: <1539027169-23332-1-git-send-email-sandeen@sandeen.net> Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org As dax inches closer to production use, an administrator should not be surprised by silently disabling the feature they asked for. Signed-off-by: Eric Sandeen --- fs/ext2/super.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/ext2/super.c b/fs/ext2/super.c index 73bd58f..b9471c0 100644 --- a/fs/ext2/super.c +++ b/fs/ext2/super.c @@ -967,8 +967,8 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent) if (sbi->s_mount_opt & EXT2_MOUNT_DAX) { if (!bdev_dax_supported(sb->s_bdev, blocksize)) { ext2_msg(sb, KERN_ERR, - "DAX unsupported by block device. Turning off DAX."); - sbi->s_mount_opt &= ~EXT2_MOUNT_DAX; + "DAX unsupported by block device."); + goto failed_mount; } }