public inbox for linux-nfs@vger.kernel.org
 help / color / mirror / Atom feed
From: Peng Tao <tao.peng@primarydata.com>
To: linux-nfs@vger.kernel.org
Cc: Trond Myklebust <trond.myklebust@primarydata.com>,
	Anna Schumaker <anna.schumaker@netapp.com>,
	Peng Tao <tao.peng@primarydata.com>
Subject: [PATCH v2 7/8] nfs42: respect clone_blksize
Date: Mon, 13 Jul 2015 17:06:07 +0800	[thread overview]
Message-ID: <1436778368-65447-8-git-send-email-tao.peng@primarydata.com> (raw)
In-Reply-To: <1436778368-65447-1-git-send-email-tao.peng@primarydata.com>

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 <tao.peng@primarydata.com>
---
 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);
-- 
1.8.3.1


  parent reply	other threads:[~2015-07-13  9:07 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-13  9:06 [PATCH v2 0/8] nfs: minor cleanups and NFSv42 CLONE support Peng Tao
2015-07-13  9:06 ` [PATCH v2 1/8] nfs42: decode_layoutstats does not need res parameter Peng Tao
2015-07-13  9:06 ` [PATCH v2 2/8] nfs42: remove unused declaration Peng Tao
2015-07-13  9:06 ` [PATCH v2 3/8] nfs42: add CLONE xdr functions Peng Tao
2015-07-13  9:06 ` [PATCH v2 4/8] nfs42: add CLONE proc functions Peng Tao
2015-07-13  9:06 ` [PATCH v2 5/8] nfs42: add NFS_IOC_CLONE ioctl Peng Tao
2015-07-13 13:53   ` Anna Schumaker
2015-07-13 15:46     ` Peng Tao
2015-07-13  9:06 ` [PATCH v2 6/8] nfs: get clone_blksize when probing fsinfo Peng Tao
2015-07-13  9:06 ` Peng Tao [this message]
2015-07-13  9:06 ` [PATCH v2 8/8] nfs42: add NFS_IOC_CLONE_RANGE ioctl Peng Tao
2015-07-26 16:59 ` [PATCH v2 0/8] nfs: minor cleanups and NFSv42 CLONE support Christoph Hellwig

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=1436778368-65447-8-git-send-email-tao.peng@primarydata.com \
    --to=tao.peng@primarydata.com \
    --cc=anna.schumaker@netapp.com \
    --cc=linux-nfs@vger.kernel.org \
    --cc=trond.myklebust@primarydata.com \
    /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