From: Goldwyn Rodrigues <rgoldwyn@suse.de>
To: linux-btrfs@vger.kernel.org
Cc: linux-fsdevel@vger.kernel.org, Goldwyn Rodrigues <rgoldwyn@suse.com>
Subject: [PATCH 14/15] btrfs: Disable dax-based defrag and send
Date: Tue, 26 Mar 2019 14:03:00 -0500 [thread overview]
Message-ID: <20190326190301.32365-15-rgoldwyn@suse.de> (raw)
In-Reply-To: <20190326190301.32365-1-rgoldwyn@suse.de>
From: Goldwyn Rodrigues <rgoldwyn@suse.com>
This is temporary, and a TODO.
Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com>
---
fs/btrfs/ioctl.c | 13 +++++++++++++
fs/btrfs/send.c | 4 ++++
2 files changed, 17 insertions(+)
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index 2e5137b01561..f532a8df2026 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -2980,6 +2980,12 @@ static int btrfs_ioctl_defrag(struct file *file, void __user *argp)
goto out;
}
+ if (IS_DAX(inode)) {
+ btrfs_warn(root->fs_info, "File defrag is not supported with DAX");
+ ret = -EOPNOTSUPP;
+ goto out;
+ }
+
if (argp) {
if (copy_from_user(range, argp,
sizeof(*range))) {
@@ -4647,6 +4653,10 @@ static long btrfs_ioctl_balance(struct file *file, void __user *arg)
if (!capable(CAP_SYS_ADMIN))
return -EPERM;
+ /* send can be on a directory, so check super block instead */
+ if (btrfs_test_opt(fs_info, DAX))
+ return -EOPNOTSUPP;
+
ret = mnt_want_write_file(file);
if (ret)
return ret;
@@ -5499,6 +5509,9 @@ static int _btrfs_ioctl_send(struct file *file, void __user *argp, bool compat)
struct btrfs_ioctl_send_args *arg;
int ret;
+ if (IS_DAX(file_inode(file)))
+ return -EOPNOTSUPP;
+
if (compat) {
#if defined(CONFIG_64BIT) && defined(CONFIG_COMPAT)
struct btrfs_ioctl_send_args_32 args32;
diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
index 7ea2d6b1f170..9679fd54db86 100644
--- a/fs/btrfs/send.c
+++ b/fs/btrfs/send.c
@@ -6609,6 +6609,10 @@ long btrfs_ioctl_send(struct file *mnt_file, struct btrfs_ioctl_send_args *arg)
int sort_clone_roots = 0;
int index;
+ /* send can be on a directory, so check super block instead */
+ if (btrfs_test_opt(fs_info, DAX))
+ return -EOPNOTSUPP;
+
if (!capable(CAP_SYS_ADMIN))
return -EPERM;
--
2.16.4
next prev parent reply other threads:[~2019-03-26 19:03 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20190326190301.32365-1-rgoldwyn@suse.de>
2019-03-26 19:02 ` [PATCH 01/15] btrfs: create a mount option for dax Goldwyn Rodrigues
2019-03-26 19:10 ` Matthew Wilcox
2019-03-27 11:00 ` Goldwyn Rodrigues
2019-03-27 12:00 ` Matthew Wilcox
2019-03-27 12:26 ` Goldwyn Rodrigues
2019-03-27 23:31 ` Goldwyn Rodrigues
2019-03-27 17:38 ` Adam Borowski
2019-03-28 14:49 ` David Sterba
2019-03-28 17:28 ` David Sterba
2019-03-28 17:57 ` Darrick J. Wong
2019-04-01 20:43 ` Goldwyn Rodrigues
2019-03-26 19:02 ` [PATCH 02/15] btrfs: Carve out btrfs_get_extent_map_write() out of btrfs_get_blocks_write() Goldwyn Rodrigues
2019-03-26 19:02 ` [PATCH 03/15] btrfs: basic dax read Goldwyn Rodrigues
2019-03-26 19:02 ` [PATCH 04/15] dax: Introduce IOMAP_F_COW for copy-on-write Goldwyn Rodrigues
2019-03-27 17:54 ` Darrick J. Wong
2019-03-27 18:58 ` Goldwyn Rodrigues
2019-03-28 14:45 ` Darrick J. Wong
2019-04-01 4:38 ` Dave Chinner
2019-04-01 21:41 ` Goldwyn Rodrigues
2019-04-01 23:06 ` Dave Chinner
2019-04-03 1:56 ` Goldwyn Rodrigues
2019-04-03 3:20 ` Dave Chinner
2019-04-07 7:26 ` Christoph Hellwig
2019-03-26 19:02 ` [PATCH 05/15] btrfs: return whether extent is nocow or not Goldwyn Rodrigues
2019-03-31 18:42 ` Nikolay Borisov
2019-03-26 19:02 ` [PATCH 06/15] btrfs: Rename __endio_write_update_ordered() to btrfs_update_ordered_extent() Goldwyn Rodrigues
2019-03-26 19:02 ` [PATCH 07/15] btrfs: add dax write support Goldwyn Rodrigues
2019-03-28 14:53 ` Darrick J. Wong
2019-04-01 20:39 ` Goldwyn Rodrigues
2019-03-26 19:02 ` [PATCH 08/15] dax: add dax_iomap_cow to copy a mmap page before writing Goldwyn Rodrigues
2019-03-28 15:41 ` Darrick J. Wong
2019-03-26 19:02 ` [PATCH 09/15] btrfs: add dax mmap support Goldwyn Rodrigues
2019-03-28 15:45 ` Darrick J. Wong
2019-03-26 19:02 ` [PATCH 10/15] btrfs: Add dax specific address_space_operations Goldwyn Rodrigues
2019-03-26 19:02 ` [PATCH 11/15] fs: dedup file range to use a compare function Goldwyn Rodrigues
2019-03-28 17:04 ` Darrick J. Wong
2019-04-01 20:36 ` Goldwyn Rodrigues
2019-03-26 19:02 ` [PATCH 12/15] btrfs: trace functions for btrfs_iomap_begin/end Goldwyn Rodrigues
2019-03-26 19:02 ` [PATCH 13/15] btrfs: handle dax page zeroing Goldwyn Rodrigues
2019-03-26 19:03 ` Goldwyn Rodrigues [this message]
2019-03-26 19:03 ` [PATCH 15/15] btrfs: Writeprotect mmap pages on snapshot Goldwyn Rodrigues
2019-03-28 15:48 ` Darrick J. Wong
2019-03-26 19:09 ` [PATCH v2 00/15] btrfs dax support Goldwyn Rodrigues
2019-03-27 20:14 ` Adam Borowski
2019-03-27 23:26 ` Goldwyn Rodrigues
2019-03-28 10:24 ` [PATCH] btrfs: allow MAP_SYNC mmap Adam Borowski
2019-03-28 10:42 ` Adam Borowski
2019-04-01 20:08 ` Goldwyn Rodrigues
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=20190326190301.32365-15-rgoldwyn@suse.de \
--to=rgoldwyn@suse.de \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=rgoldwyn@suse.com \
/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).