From: Toshi Kani <toshi.kani@hpe.com>
To: dan.j.williams@intel.com, jack@suse.cz, david@fromorbit.com
Cc: hch@infradead.org, boaz@plexistor.com, tytso@mit.edu,
adilger.kernel@dilger.ca, ross.zwisler@linux.intel.com,
toshi.kani@hpe.com, micah.parrish@hpe.com,
linux-nvdimm@ml01.01.org, linux-fsdevel@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v2 3/3] xfs: Add alignment check for DAX mount
Date: Mon, 2 May 2016 12:42:58 -0600 [thread overview]
Message-ID: <1462214578-27122-4-git-send-email-toshi.kani@hpe.com> (raw)
In-Reply-To: <1462214578-27122-1-git-send-email-toshi.kani@hpe.com>
When a partition is not aligned by 4KB, mount -o dax succeeds,
but any read/write access to the filesystem fails, except for
metadata update.
Call bdev_direct_access to check the alignment when -o dax is
specified.
Signed-off-by: Toshi Kani <toshi.kani@hpe.com>
Cc: Dave Chinner <david@fromorbit.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Ross Zwisler <ross.zwisler@linux.intel.com>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Boaz Harrosh <boaz@plexistor.com>
---
fs/xfs/xfs_super.c | 23 +++++++++++++++++++----
1 file changed, 19 insertions(+), 4 deletions(-)
diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index 187e14b..b7ee323 100644
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -1557,15 +1557,30 @@ xfs_fs_fill_super(
sb->s_flags |= MS_I_VERSION;
if (mp->m_flags & XFS_MOUNT_DAX) {
+ struct blk_dax_ctl dax = {
+ .sector = 0,
+ .size = PAGE_SIZE,
+ };
xfs_warn(mp,
- "DAX enabled. Warning: EXPERIMENTAL, use at your own risk");
+ "DAX enabled. Warning: EXPERIMENTAL, use at your own risk");
if (sb->s_blocksize != PAGE_SIZE) {
xfs_alert(mp,
"Filesystem block size invalid for DAX Turning DAX off.");
mp->m_flags &= ~XFS_MOUNT_DAX;
- } else if (!sb->s_bdev->bd_disk->fops->direct_access) {
- xfs_alert(mp,
- "Block device does not support DAX Turning DAX off.");
+ } else if ((error = bdev_direct_access(sb->s_bdev, &dax)) < 0) {
+ switch (error) {
+ case -EOPNOTSUPP:
+ xfs_alert(mp,
+ "Block device does not support DAX Turning DAX off.");
+ break;
+ case -EINVAL:
+ xfs_alert(mp,
+ "Partition alignment invalid for DAX Turning DAX off.");
+ break;
+ default:
+ xfs_alert(mp,
+ "DAX access failed (%d) DAX Turning DAX off.", error);
+ }
mp->m_flags &= ~XFS_MOUNT_DAX;
}
}
next prev parent reply other threads:[~2016-05-02 18:52 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-02 18:42 [PATCH v2 0/3] " Toshi Kani
2016-05-02 18:42 ` [PATCH v2 1/3] ext4: " Toshi Kani
2016-05-03 7:58 ` Jan Kara
2016-05-03 8:44 ` Christoph Hellwig
2016-05-03 9:00 ` Jan Kara
2016-05-03 14:43 ` Ross Zwisler
2016-05-03 15:41 ` Toshi Kani
2016-05-04 15:42 ` Toshi Kani
2016-05-02 18:42 ` [PATCH v2 2/3] ext2: " Toshi Kani
2016-05-03 8:01 ` Jan Kara
2016-05-02 18:42 ` Toshi Kani [this message]
2016-05-02 19:50 ` [PATCH v2 3/3] xfs: " Ross Zwisler
2016-05-02 19:54 ` Toshi Kani
2016-05-04 23:18 ` Dave Chinner
2016-05-04 23:41 ` Toshi Kani
2016-05-05 8:03 ` Jan Kara
2016-05-02 19:20 ` [PATCH v2 0/3] " Boaz Harrosh
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1462214578-27122-4-git-send-email-toshi.kani@hpe.com \
--to=toshi.kani@hpe.com \
--cc=adilger.kernel@dilger.ca \
--cc=boaz@plexistor.com \
--cc=dan.j.williams@intel.com \
--cc=david@fromorbit.com \
--cc=hch@infradead.org \
--cc=jack@suse.cz \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nvdimm@ml01.01.org \
--cc=micah.parrish@hpe.com \
--cc=ross.zwisler@linux.intel.com \
--cc=tytso@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®