[PATCH-RFC-RESEND 7/9] nfs42: respect clone_blksize
From: Peng Tao <hidden>
Date: 2015-08-26 08:19:14
Also in:
linux-fsdevel, linux-nfs
Subsystem:
filesystems (vfs and infrastructure), nfs, sunrpc, and lockd clients, the rest · Maintainers:
Alexander Viro, Christian Brauner, Trond Myklebust, Anna Schumaker, Linus Torvalds
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 <redacted> --- fs/nfs/nfs4file.c | 8 ++++++++ 1 file changed, 8 insertions(+)
diff --git a/fs/nfs/nfs4file.c b/fs/nfs/nfs4file.c
index c335cb0..ee8c014 100644
--- a/fs/nfs/nfs4file.c
+++ b/fs/nfs/nfs4file.c@@ -174,12 +174,20 @@ nfs42_file_clone_range(struct file *src_file, struct file *dst_file, { struct inode *dst_inode = file_inode(dst_file); struct inode *src_inode = file_inode(src_file); + struct nfs_server *server = NFS_SERVER(dst_inode); + unsigned int bs = server->clone_blksize; int ret; /* src and dst must be different files */ if (src_inode == dst_inode) return -EINVAL; + /* check alignment w.r.t. clone_blksize */ + if (bs) + if (!IS_ALIGNED(src_off, bs) || !IS_ALIGNED(dst_off, bs) || + (!IS_ALIGNED(count, bs) && i_size_read(src_inode) != (src_off + count))) + 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);
--
1.8.3.1