From patchwork Mon Jul 13 05:50:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Tao X-Patchwork-Id: 6774211 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 68FD4C05AC for ; Mon, 13 Jul 2015 05:51:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 923EB205EB for ; Mon, 13 Jul 2015 05:51:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B0B1E204EC for ; Mon, 13 Jul 2015 05:51:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751166AbbGMFvo (ORCPT ); Mon, 13 Jul 2015 01:51:44 -0400 Received: from mail-pa0-f49.google.com ([209.85.220.49]:33021 "EHLO mail-pa0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751038AbbGMFvn (ORCPT ); Mon, 13 Jul 2015 01:51:43 -0400 Received: by padck2 with SMTP id ck2so36790298pad.0 for ; Sun, 12 Jul 2015 22:51:43 -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=tWYHpsc1u1hNPdtzJ7EBfOV5BvbagMyksaW21C5kKSw=; b=MqDKtN3k0Vcf/aRd5UsxtEykFL1gp/GAw7wDqIBEtspYg5wleMcwp5kI8qQqdsjVdJ JmmOYEpOQ+dJRoWT+VdeM6MRpsQygNV5RC7CbZC9X4Z5m+1nslztlKEoezrT45aHaNtH O7f8lGEBSqKmvSuI1FXhNT3sLFMCvgGKnRAxmSOkVeYngRjncRxunQj7Zkr/nrp/o+Jp l4X3zCbxHDwQHMQ6UmaGQxA6NbGVgn8MGqcGnpa1K0SHAoDKVy4FQTYCJ0YAgF5a1y6k rPfSKs/fkTWcNgznn7KaWYosad9GYGaLMqL7hJND7ZZao50YsUrju2PtAMC8XPIyqPyx 9B2g== X-Gm-Message-State: ALoCoQmCHbntvBTv+PtTMfGCdA+Fkg0AE1G9228k4K7SgJXDsL8IqZ+B5W6+GoPPGfRsJJbphJGZ X-Received: by 10.68.244.197 with SMTP id xi5mr65039957pbc.45.1436766703074; Sun, 12 Jul 2015 22:51:43 -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 ho10sm17001275pbc.27.2015.07.12.22.51.40 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 12 Jul 2015 22:51:42 -0700 (PDT) From: Peng Tao To: linux-nfs@vger.kernel.org Cc: Trond Myklebust , Anna Schumaker , Peng Tao Subject: [PATCH 7/7] nfs42: respect clone_blksize Date: Mon, 13 Jul 2015 13:50:55 +0800 Message-Id: <1436766655-10696-8-git-send-email-tao.peng@primarydata.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1436766655-10696-1-git-send-email-tao.peng@primarydata.com> References: <1436766655-10696-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=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 draft-ietf-nfsv4-minorversion2-38.txt says: Both cl_src_offset and cl_dst_offset must be aligned to the clone block size Section 12.2.1. The number of bytes to be cloned must be a multiple of the clone block size, except in the case in which cl_src_offset plus the number of bytes to be cloned is equal to the source file size. Signed-off-by: Peng Tao --- fs/nfs/nfs4file.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/fs/nfs/nfs4file.c b/fs/nfs/nfs4file.c index dfa6620..e450a5f 100644 --- a/fs/nfs/nfs4file.c +++ b/fs/nfs/nfs4file.c @@ -173,8 +173,10 @@ nfs42_ioctl_clone(struct file *dst_file, unsigned long srcfd, u64 src_off, u64 dst_off, u64 count) { struct inode *dst_inode = file_inode(dst_file); + struct nfs_server *server = NFS_SERVER(dst_inode); struct fd src_file; struct inode *src_inode; + unsigned int bs = server->clone_blksize; int ret; /* dst file must be opened for writing */ @@ -212,6 +214,15 @@ nfs42_ioctl_clone(struct file *dst_file, unsigned long srcfd, src_inode->i_sb != dst_inode->i_sb) goto out_fput; + /* check alignment w.r.t. clone_blksize */ + ret = -EINVAL; + if (bs) { + if (!IS_ALIGNED(src_off, bs) || !IS_ALIGNED(dst_off, bs)) + goto out_fput; + if (!IS_ALIGNED(count, bs) && i_size_read(src_inode) != (src_off + count)) + goto out_fput; + } + /* 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);