Commit 837bb1d7 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4.2: Fix writeback races in nfs4_copy_file_range 



We need to ensure that any writes to the destination file are serialised
with the copy, meaning that the writeback has to occur under the inode lock.

Also relax the writeback requirement on the source, and rely on the
stateid checking to tell us if the source rebooted. Add the helper
nfs_filemap_write_and_wait_range() to call pnfs_sync_inode() as
is appropriate for pNFS servers that may need a layoutcommit.

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 1e564d3d

fs/nfs/internal.h

+3 −0
Original line number Diff line number Diff line
@@ -512,6 +512,9 @@ int nfs_key_timeout_notify(struct file *filp, struct inode *inode); 
bool nfs_ctx_key_to_expire(struct nfs_open_context *ctx);

void nfs_pageio_stop_mirroring(struct nfs_pageio_descriptor *pgio);



int nfs_filemap_write_and_wait_range(struct address_space *mapping,

		loff_t lstart, loff_t lend);



#ifdef CONFIG_NFS_V4_1

static inline

void nfs_clear_pnfs_ds_commit_verifiers(struct pnfs_ds_commit_info *cinfo)

fs/nfs/nfs42proc.c

+9 −0
Original line number Diff line number Diff line
@@ -156,11 +156,20 @@ static ssize_t _nfs42_proc_copy(struct file *src, loff_t pos_src, 
	if (status)

		return status;



	status = nfs_filemap_write_and_wait_range(file_inode(src)->i_mapping,

			pos_src, pos_src + (loff_t)count - 1);

	if (status)

		return status;



	status = nfs4_set_rw_stateid(&args.dst_stateid, dst_lock->open_context,

				     dst_lock, FMODE_WRITE);

	if (status)

		return status;



	status = nfs_sync_inode(dst_inode);

	if (status)

		return status;



	status = nfs4_call_sync(server->client, server, &msg,

				&args.seq_args, &res.seq_res, 0);

	if (status == -ENOTSUPP)

fs/nfs/nfs4file.c

+1 −13
Original line number Diff line number Diff line
@@ -133,21 +133,9 @@ static ssize_t nfs4_copy_file_range(struct file *file_in, loff_t pos_in, 
				    struct file *file_out, loff_t pos_out,

				    size_t count, unsigned int flags)

{

	struct inode *in_inode = file_inode(file_in);

	struct inode *out_inode = file_inode(file_out);

	int ret;



	if (in_inode == out_inode)

	if (file_inode(file_in) == file_inode(file_out))

		return -EINVAL;



	/* flush any pending writes */

	ret = nfs_sync_inode(in_inode);

	if (ret)

		return ret;

	ret = nfs_sync_inode(out_inode);

	if (ret)

		return ret;



	return nfs42_proc_copy(file_in, pos_in, file_out, pos_out, count);

}

fs/nfs/write.c

+18 −0
Original line number Diff line number Diff line
@@ -1912,6 +1912,24 @@ out_mark_dirty: 
}

EXPORT_SYMBOL_GPL(nfs_write_inode);



/*

 * Wrapper for filemap_write_and_wait_range()

 *

 * Needed for pNFS in order to ensure data becomes visible to the

 * client.

 */

int nfs_filemap_write_and_wait_range(struct address_space *mapping,

		loff_t lstart, loff_t lend)

{

	int ret;



	ret = filemap_write_and_wait_range(mapping, lstart, lend);

	if (ret == 0)

		ret = pnfs_sync_inode(mapping->host, true);

	return ret;

}

EXPORT_SYMBOL_GPL(nfs_filemap_write_and_wait_range);



/*

 * flush the inode to disk.

 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE