From patchwork Wed Aug 26 08:16:46 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Tao X-Patchwork-Id: 7075321 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 D15979F305 for ; Wed, 26 Aug 2015 08:20:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0C1C7207F1 for ; Wed, 26 Aug 2015 08:20:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 26253205C4 for ; Wed, 26 Aug 2015 08:20:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756584AbbHZIUB (ORCPT ); Wed, 26 Aug 2015 04:20:01 -0400 Received: from mail-pa0-f52.google.com ([209.85.220.52]:36017 "EHLO mail-pa0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756531AbbHZITF (ORCPT ); Wed, 26 Aug 2015 04:19:05 -0400 Received: by pacgr6 with SMTP id gr6so1408764pac.3 for ; Wed, 26 Aug 2015 01:19:04 -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=+4VYnPQdGYwqGQb26KDPzLgFwAeHsY+wmED8ItIMM0U=; b=maDncd4+M4hY5HvJj1gvvU8KC1SIXeojpQMokG8a0YsI7RgXhCaC82oFhM25ktN8eV 0R/WRXefomKbAt0NHA3g1ejpwoGDJLlesKRm230u4btgyTucIqYyNmZbsBmYAdDzPEaz eFTcUFRN0r2JEZRLXljeSFb1ZogFnACC7P3K+SAsn/DgPppzSOT7m35d8P1shlsjrQnc EKY5izHcaeSnG1hd9z3H4S6CtlwlK630X8c8ZlfjZ9KeKGyO/auWpp2SXJ5SW9gBM+lz AAiQzHGrEyk0TQCdHMsP5BRELrEnAcxUdT+sAHJS43fwcEikxrcm533CZbgS2hUj/Q8z K6rA== X-Gm-Message-State: ALoCoQmyQcRkHaRLhslR5DCBZYs79MXUS2/sl2Ow3xSjSU4r0EOrXIF9O/QYoVw54vhLbsWW93qL X-Received: by 10.69.1.7 with SMTP id bc7mr67607682pbd.154.1440577144686; Wed, 26 Aug 2015 01:19:04 -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 a2sm23689455pbu.41.2015.08.26.01.19.00 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 26 Aug 2015 01:19:04 -0700 (PDT) From: Peng Tao To: linux-fsdevel@vger.kernel.org Cc: Trond Myklebust , Anna Schumaker , Christoph Hellwig , Zach Brown , Darren Hart , bfields@fieldses.org, Jeff Layton , linux-nfs@vger.kernel.org, "Darrick J. Wong" , linux-btrfs@vger.kernel.org, Peng Tao Subject: [PATCH-RFC-RESEND 5/9] nfs42: add .copy_range file operation Date: Wed, 26 Aug 2015 16:16:46 +0800 Message-Id: <1440577010-122867-6-git-send-email-tao.peng@primarydata.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1440577010-122867-1-git-send-email-tao.peng@primarydata.com> References: <1440577010-122867-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=-8.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 Signed-off-by: Peng Tao --- fs/nfs/nfs4file.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/fs/nfs/nfs4file.c b/fs/nfs/nfs4file.c index dcd39d4..c335cb0 100644 --- a/fs/nfs/nfs4file.c +++ b/fs/nfs/nfs4file.c @@ -4,6 +4,7 @@ * Copyright (C) 1992 Rick Sladkey */ #include +#include #include #include #include "internal.h" @@ -166,6 +167,54 @@ static long nfs42_fallocate(struct file *filep, int mode, loff_t offset, loff_t return nfs42_proc_deallocate(filep, offset, len); return nfs42_proc_allocate(filep, offset, len); } + +static noinline int +nfs42_file_clone_range(struct file *src_file, struct file *dst_file, + loff_t src_off, size_t dst_off, loff_t count) +{ + struct inode *dst_inode = file_inode(dst_file); + struct inode *src_inode = file_inode(src_file); + int ret; + + /* src and dst must be different files */ + if (src_inode == dst_inode) + return -EINVAL; + + /* XXX: do we lock at all? what if server needs CB_RECALL_LAYOUT? */ + if (dst_inode < src_inode) { + mutex_lock_nested(&dst_inode->i_mutex, I_MUTEX_PARENT); + mutex_lock_nested(&src_inode->i_mutex, I_MUTEX_CHILD); + } else { + mutex_lock_nested(&src_inode->i_mutex, I_MUTEX_PARENT); + mutex_lock_nested(&dst_inode->i_mutex, I_MUTEX_CHILD); + } + + /* flush all pending writes on both src and dst so that server + * has the latest data */ + ret = nfs_sync_inode(src_inode); + if (ret) + goto out_unlock; + ret = nfs_sync_inode(dst_inode); + if (ret) + goto out_unlock; + + ret = nfs42_proc_clone(src_file, dst_file, src_off, dst_off, count); + + /* truncate inode page cache of the dst range so that future reads can fetch + * new data from server */ + if (!ret) + truncate_inode_pages_range(&dst_inode->i_data, dst_off, dst_off + count - 1); + +out_unlock: + if (dst_inode < src_inode) { + mutex_unlock(&src_inode->i_mutex); + mutex_unlock(&dst_inode->i_mutex); + } else { + mutex_unlock(&dst_inode->i_mutex); + mutex_unlock(&src_inode->i_mutex); + } + return ret; +} #endif /* CONFIG_NFS_V4_2 */ const struct file_operations nfs4_file_operations = { @@ -187,6 +236,7 @@ const struct file_operations nfs4_file_operations = { .splice_write = iter_file_splice_write, #ifdef CONFIG_NFS_V4_2 .fallocate = nfs42_fallocate, + .clone_range = nfs42_file_clone_range, #endif /* CONFIG_NFS_V4_2 */ .check_flags = nfs_check_flags, .setlease = simple_nosetlease,