D43524.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D43524.diff
View Options

	diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c
	--- a/sys/kern/vfs_vnops.c
	+++ b/sys/kern/vfs_vnops.c
	@@ -3339,7 +3339,7 @@
	off_t startoff, endoff, xfer, xfer2;
	u_long blksize;
	int error, interrupted;
	- bool cantseek, readzeros, eof, lastblock, holetoeof, sparse;
	+ bool cantseek, readzeros, eof, first, lastblock, holetoeof, sparse;
	ssize_t aresid, r = 0;
	size_t copylen, len, savlen;
	off_t outsize;
	@@ -3480,6 +3480,7 @@
	endts.tv_sec++;
	} else
	timespecclear(&endts);
	+ first = true;
	holetoeof = eof = false;
	while (len > 0 && error == 0 && !eof && interrupted == 0) {
	endoff = 0; /* To shut up compilers. */
	@@ -3581,10 +3582,17 @@
	*/
	xfer -= (*inoffp % blksize);
	}
	- /* Loop copying the data block. */
	- while (copylen > 0 && error == 0 && !eof && interrupted == 0) {
	+
	+ /*
	+ * Loop copying the data block. If this was our first attempt
	+ * to copy anything, allow a zero-length block so that the VOPs
	+ * get a chance to update metadata, specifically the atime.
	+ */
	+ while (error == 0 && ((copylen > 0 && !eof) \|\| first) &&
	+ interrupted == 0) {
	if (copylen < xfer)
	xfer = copylen;
	+ first = false;
	error = vn_lock(invp, LK_SHARED);
	if (error != 0)
	goto out;
	@@ -3594,7 +3602,7 @@
	curthread);
	VOP_UNLOCK(invp);
	lastblock = false;
	- if (error == 0 && aresid > 0) {
	+ if (error == 0 && (xfer == 0 \|\| aresid > 0)) {
	/* Stop the copy at EOF on the input file. */
	xfer -= aresid;
	eof = true;