From patchwork Fri Sep 25 18:24:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Tao X-Patchwork-Id: 7263311 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 F14E1BEEC1 for ; Fri, 25 Sep 2015 10:26:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1F0862084C for ; Fri, 25 Sep 2015 10:26:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3B1DF207ED for ; Fri, 25 Sep 2015 10:26:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753313AbbIYK0U (ORCPT ); Fri, 25 Sep 2015 06:26:20 -0400 Received: from mail-pa0-f52.google.com ([209.85.220.52]:35575 "EHLO mail-pa0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754043AbbIYK0T (ORCPT ); Fri, 25 Sep 2015 06:26:19 -0400 Received: by pacfv12 with SMTP id fv12so104361615pac.2 for ; Fri, 25 Sep 2015 03:26:19 -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=khgNd+62m9BTTfbc+dV0oJwlrJm0GchH7/Kqj6qRiwI=; b=dBg5He/QMy9mlKIy58WBmxT8mXdy/vbduus5Ts9O6bo0WaeTpWdcLsQg1aV1U+KYgK uCWEBDyqDGfALFa+cAzt1sfHBq9S6jIF3HaohjcHcNVp+wrEJSXEnOP1ET3jVrLR6a8m 6rFvWN44BhkXef29hmBqgvcoSuslj4CfF1qS1CCj27o9KFb6RvGG+agpw5kf8WCkenJ8 fHqaDnB2ayskVgP+yo88OdutUWTtjZQfGctUmfbwV8Ey1zYcyuwQE8+a9uH5NMUbqr1+ 7OdB5a1hmVRya0nohXEUaDxZLpS7s6GJIiNrLJn+XJQm/XeDvSt9Yd4upABhHNtzP/OI 88Yw== X-Gm-Message-State: ALoCoQnKUonXhNiiX1dUjkB7TDUYTnkKLnwyV8W1U4pNaBZV5+7yFVjKSyi+L1ydYK9s5LMsxl8I X-Received: by 10.68.69.35 with SMTP id b3mr6500739pbu.22.1443176779354; Fri, 25 Sep 2015 03:26:19 -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.16 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Sep 2015 03:26:18 -0700 (PDT) From: Peng Tao To: Trond Myklebust Cc: linux-nfs@vger.kernel.org, Anna Schumaker , Christoph Hellwig , Peng Tao Subject: [PATCH 5/6] nfs42: respect clone_blksize Date: Sat, 26 Sep 2015 02:24:38 +0800 Message-Id: <1443205479-13563-6-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 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 fc68ba5..4f463dd 100644 --- a/fs/nfs/nfs4file.c +++ b/fs/nfs/nfs4file.c @@ -199,8 +199,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 */ @@ -238,6 +240,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);