From: Peng Tao <tao.peng@primarydata.com>
To: linux-fsdevel@vger.kernel.org
Cc: Trond Myklebust <trond.myklebust@primarydata.com>,
Anna Schumaker <anna.schumaker@netapp.com>,
Christoph Hellwig <hch@infradead.org>, Zach Brown <zab@zabbo.net>,
Darren Hart <dvhart@linux.intel.com>,
Jeff Layton <jeff.layton@primarydata.com>,
bfields@fieldses.org, "Darrick J. Wong" <darrick.wong@oracle.com>,
viro@zeniv.linux.org.uk, linux-nfs@vger.kernel.org,
linux-btrfs@vger.kernel.org, linux-cifs@vger.kernel.org,
Steve French <steve.french@primarydata.com>,
Peng Tao <tao.peng@primarydata.com>
Subject: [PATCH 5/9] btrfs: remove btrfs_ioctl_clone(_range)
Date: Sun, 25 Oct 2015 07:17:12 +0800 [thread overview]
Message-ID: <1445728636-10109-6-git-send-email-tao.peng@primarydata.com> (raw)
In-Reply-To: <1445728636-10109-1-git-send-email-tao.peng@primarydata.com>
BTRFS_IOC_CLONE/BTRFS_IOC_CLONE_RANGE is now handled
by generic layer and goes through the .copy_file_range
method.
Signed-off-by: Peng Tao <tao.peng@primarydata.com>
---
fs/btrfs/ioctl.c | 49 -------------------------------------------------
1 file changed, 49 deletions(-)
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index d3697e8..b568e24 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -3854,51 +3854,6 @@ ssize_t btrfs_copy_file_range(struct file *file_in, loff_t pos_in,
return ret;
}
-static noinline long btrfs_ioctl_clone(struct file *file, unsigned long srcfd,
- u64 off, u64 olen, u64 destoff)
-{
- struct fd src_file;
- int ret;
-
- /* the destination must be opened for writing */
- if (!(file->f_mode & FMODE_WRITE) || (file->f_flags & O_APPEND))
- return -EINVAL;
-
- ret = mnt_want_write_file(file);
- if (ret)
- return ret;
-
- src_file = fdget(srcfd);
- if (!src_file.file) {
- ret = -EBADF;
- goto out_drop_write;
- }
-
- /* the src must be open for reading */
- if (!(src_file.file->f_mode & FMODE_READ)) {
- ret = -EINVAL;
- goto out_fput;
- }
-
- ret = btrfs_clone_files(file, src_file.file, off, olen, destoff);
-
-out_fput:
- fdput(src_file);
-out_drop_write:
- mnt_drop_write_file(file);
- return ret;
-}
-
-static long btrfs_ioctl_clone_range(struct file *file, void __user *argp)
-{
- struct btrfs_ioctl_clone_range_args args;
-
- if (copy_from_user(&args, argp, sizeof(args)))
- return -EFAULT;
- return btrfs_ioctl_clone(file, args.src_fd, args.src_offset,
- args.src_length, args.dest_offset);
-}
-
/*
* there are many ways the trans_start and trans_end ioctls can lead
* to deadlocks. They should only be used by applications that
@@ -5438,10 +5393,6 @@ long btrfs_ioctl(struct file *file, unsigned int
return btrfs_ioctl_dev_info(root, argp);
case BTRFS_IOC_BALANCE:
return btrfs_ioctl_balance(file, NULL);
- case BTRFS_IOC_CLONE:
- return btrfs_ioctl_clone(file, arg, 0, 0, 0);
- case BTRFS_IOC_CLONE_RANGE:
- return btrfs_ioctl_clone_range(file, argp);
case BTRFS_IOC_TRANS_START:
return btrfs_ioctl_trans_start(file);
case BTRFS_IOC_TRANS_END:
--
1.8.3.1
next prev parent reply other threads:[~2015-10-24 23:17 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-24 23:17 [PATCH 0/9] vfs: move btrfs clone ioctls to common code Peng Tao
[not found] ` <1445728636-10109-1-git-send-email-tao.peng-7I+n7zu2hftEKMMhf/gKZA@public.gmane.org>
2015-10-24 23:17 ` [PATCH 1/9] vfs: add COPY_FILE_CLONE_ONLY flag Peng Tao
[not found] ` <1445728636-10109-2-git-send-email-tao.peng-7I+n7zu2hftEKMMhf/gKZA@public.gmane.org>
2015-11-13 8:58 ` Christoph Hellwig
2015-10-24 23:17 ` [PATCH 4/9] vfs: pull btrfs clone API to vfs layer Peng Tao
2015-10-24 23:17 ` [PATCH 2/9] cifs: add .copy_file_range file operation Peng Tao
2015-10-27 17:13 ` Steve French
2015-10-24 23:17 ` [PATCH 3/9] nfs42: " Peng Tao
2015-10-24 23:17 ` Peng Tao [this message]
2015-10-24 23:17 ` [PATCH 6/9] cifs: remove private handler of BTRFS_IOC_CLONE Peng Tao
2015-10-24 23:17 ` [PATCH 7/9] nfs42: remove private clone ioctl handler Peng Tao
2015-10-24 23:17 ` [PATCH 8/9] nfsd: Pass filehandle to nfs4_preprocess_stateid_op() Peng Tao
2015-10-24 23:17 ` [PATCH 9/9] NFSD: Implement the CLONE call Peng Tao
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=1445728636-10109-6-git-send-email-tao.peng@primarydata.com \
--to=tao.peng@primarydata.com \
--cc=anna.schumaker@netapp.com \
--cc=bfields@fieldses.org \
--cc=darrick.wong@oracle.com \
--cc=dvhart@linux.intel.com \
--cc=hch@infradead.org \
--cc=jeff.layton@primarydata.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-cifs@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=steve.french@primarydata.com \
--cc=trond.myklebust@primarydata.com \
--cc=viro@zeniv.linux.org.uk \
--cc=zab@zabbo.net \
/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).