From patchwork Fri Sep 25 18:24:39 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Tao X-Patchwork-Id: 7263321 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 809279F380 for ; Fri, 25 Sep 2015 10:26:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 99B572088D for ; Fri, 25 Sep 2015 10:26:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AF0912084C for ; Fri, 25 Sep 2015 10:26:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754060AbbIYK0X (ORCPT ); Fri, 25 Sep 2015 06:26:23 -0400 Received: from mail-pa0-f48.google.com ([209.85.220.48]:34530 "EHLO mail-pa0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754043AbbIYK0X (ORCPT ); Fri, 25 Sep 2015 06:26:23 -0400 Received: by padhy16 with SMTP id hy16so102666175pad.1 for ; Fri, 25 Sep 2015 03:26:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=JF5j32xDAU/FS1Lc9cgZZGlDm/se0YxZsOpyqNhnFoc=; b=OANWgGHjYyOu/uiBpRdhDaUs4dgx6IunWmZpQAyXJgyqxy/aaJKqUcQzT8M53OjX4k DKo8JlNpdVMSDik+qWAXGaUhVAf4tx25iZQL/e/w4Dwdeyrm+UDl0PguJ3t7OG5YqOjT YgWR3uu/j0vvihNtRtz7H4NbeYrD6dpndjfKEmC0Rl4vHZj1/MkwE64DHMcgEOtZU/qY ZpjyqAY/gjKurq8jqAYfQioO3aYpGn5LxHyz/F5bJhLa07svG4Ioeyemsk8yPkaZKWg8 ykPIwFNhi3WAvz2GvFS0MIi9BMZbrg38zkGnBmKB8+ZYRbLzv3hKDS/LepUaBo7APmKa 2YaQ== X-Gm-Message-State: ALoCoQnyo0/lTkI3faNreoK9TT4T/VuSiyeGYv+ke2AcUsi9Ett/N+OWOzEqDMedCbQbON6OjOIq X-Received: by 10.66.145.193 with SMTP id sw1mr6370709pab.74.1443176782925; Fri, 25 Sep 2015 03:26:22 -0700 (PDT) Received: from lear.localdomain (ec2-54-65-164-9.ap-northeast-1.compute.amazonaws.com. [54.65.164.9]) by smtp.gmail.com with ESMTPSA id ce3sm2680270pbb.35.2015.09.25.03.26.19 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Sep 2015 03:26:22 -0700 (PDT) From: Peng Tao To: Trond Myklebust Cc: linux-nfs@vger.kernel.org, Anna Schumaker , Christoph Hellwig , Peng Tao Subject: [PATCH 6/6] nfs42: add NFS_IOC_CLONE_RANGE ioctl Date: Sat, 26 Sep 2015 02:24:39 +0800 Message-Id: <1443205479-13563-7-git-send-email-tao.peng@primarydata.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1443205479-13563-1-git-send-email-tao.peng@primarydata.com> References: <1443205479-13563-1-git-send-email-tao.peng@primarydata.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-5.0 required=5.0 tests=BAYES_00, DATE_IN_FUTURE_06_12, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP It follows btrfs BTRFS_IOC_CLONE_RANGE lead on ioctl number and arguments. Signed-off-by: Peng Tao --- fs/nfs/nfs4file.c | 14 ++++++++++++++ include/uapi/linux/nfs.h | 9 ++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/fs/nfs/nfs4file.c b/fs/nfs/nfs4file.c index 4f463dd..4384a1d 100644 --- a/fs/nfs/nfs4file.c +++ b/fs/nfs/nfs4file.c @@ -288,14 +288,28 @@ out_drop_write: mnt_drop_write_file(dst_file); return ret; } + +static long nfs42_ioctl_clone_range(struct file *dst_file, void __user *argp) +{ + struct nfs_ioctl_clone_range_args args; + + if (copy_from_user(&args, argp, sizeof(args))) + return -EFAULT; + + return nfs42_ioctl_clone(dst_file, args.src_fd, args.src_off, args.dst_off, args.count); +} #endif /* CONFIG_NFS_V4_2 */ long nfs4_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { + void __user *argp = (void __user *)arg; + switch (cmd) { #ifdef CONFIG_NFS_V4_2 case NFS_IOC_CLONE: return nfs42_ioctl_clone(file, arg, 0, 0, 0); + case NFS_IOC_CLONE_RANGE: + return nfs42_ioctl_clone_range(file, argp); #endif } diff --git a/include/uapi/linux/nfs.h b/include/uapi/linux/nfs.h index d85748d..c6b86cc 100644 --- a/include/uapi/linux/nfs.h +++ b/include/uapi/linux/nfs.h @@ -33,7 +33,14 @@ /* NFS ioctls */ /* Let's follow btrfs lead on CLONE to avoid messing userspace */ -#define NFS_IOC_CLONE _IOW(0x94, 9, int) +#define NFS_IOC_CLONE _IOW(0x94, 9, int) +#define NFS_IOC_CLONE_RANGE _IOW(0x94, 13, int) + +struct nfs_ioctl_clone_range_args { + __s64 src_fd; + __u64 src_off, count; + __u64 dst_off; +}; /* * NFS stats. The good thing with these values is that NFSv3 errors are