linux-xfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Eric Sandeen <sandeen@redhat.com>
To: linux-xfs <linux-xfs@vger.kernel.org>
Cc: Jeff Moyer <jmoyer@redhat.com>
Subject: [PATCH] xfs: return correct XFS_IOC_DIOINFO for DAX inode
Date: Tue, 2 Apr 2019 10:44:38 -0500	[thread overview]
Message-ID: <b3af182f-a547-9d04-3b29-232857e83fc4@redhat.com> (raw)

pmem is byte addressable, and indeed byte-aligned DIO works on
a DAX file.  So, teach XFS_IOC_DIOINFO to return the correct
alignment information if IS_DAX(inode).

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
---

diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
index 6ecdbb3..35eae7d 100644
--- a/fs/xfs/xfs_ioctl.c
+++ b/fs/xfs/xfs_ioctl.c
@@ -1919,12 +1919,21 @@ xfs_file_ioctl(
 	}
 	case XFS_IOC_DIOINFO: {
 		struct dioattr	da;
-		xfs_buftarg_t	*target =
-			XFS_IS_REALTIME_INODE(ip) ?
-			mp->m_rtdev_targp : mp->m_ddev_targp;
 
-		da.d_mem =  da.d_miniosz = target->bt_logical_sectorsize;
-		da.d_maxiosz = INT_MAX & ~(da.d_miniosz - 1);
+		if (IS_DAX(inode)) {
+			/* pmem is byte addressable */
+			da.d_mem = 1;
+			da.d_miniosz = 1;
+			da.d_maxiosz = INT_MAX;
+		} else {
+			xfs_buftarg_t	*target =
+				XFS_IS_REALTIME_INODE(ip) ?
+				mp->m_rtdev_targp : mp->m_ddev_targp;
+
+			da.d_mem = target->bt_logical_sectorsize;
+			da.d_miniosz = target->bt_logical_sectorsize;
+			da.d_maxiosz = INT_MAX & ~(da.d_miniosz - 1);
+		}
 
 		if (copy_to_user(arg, &da, sizeof(da)))
 			return -EFAULT;

             reply	other threads:[~2019-04-02 15:44 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-02 15:44 Eric Sandeen [this message]
2019-04-02 17:56 ` [PATCH] xfs: return correct XFS_IOC_DIOINFO for DAX inode Darrick J. Wong
2019-04-02 18:08   ` Eric Sandeen
2019-04-02 21:31   ` Dave Chinner
2019-04-03  1:08     ` Eric Sandeen

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=b3af182f-a547-9d04-3b29-232857e83fc4@redhat.com \
    --to=sandeen@redhat.com \
    --cc=jmoyer@redhat.com \
    --cc=linux-xfs@vger.kernel.org \
    /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;
as well as URLs for NNTP newsgroup(s).