Revert "[PATCH] generic_file_buffered_write(): handle zero-length iovec segments" (4b49643f) · Commits · 戴 / test

mm/filemap.c

+1 −8

Original line number	Original line	Diff line number	Diff line
	@@ -1895,12 +1895,6 @@ generic_file_buffered_write(struct kiocb iocb, const struct iovec iov,
	break;		break;
	}		}

	if (unlikely(bytes == 0)) {
	status = 0;
	copied = 0;
	goto zero_length_segment;
	}

	status = a_ops->prepare_write(file, page, offset, offset+bytes);		status = a_ops->prepare_write(file, page, offset, offset+bytes);
	if (unlikely(status)) {		if (unlikely(status)) {
	loff_t isize = i_size_read(inode);		loff_t isize = i_size_read(inode);
	@@ -1930,8 +1924,7 @@ generic_file_buffered_write(struct kiocb iocb, const struct iovec iov,
	page_cache_release(page);		page_cache_release(page);
	continue;		continue;
	}		}
	zero_length_segment:		if (likely(copied > 0)) {
	if (likely(copied >= 0)) {
	if (!status)		if (!status)
	status = copied;		status = copied;

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -87,7 +87,7 @@ filemap_set_next_iovec(const struct iovec *iovp, size_t basep, size_t bytes)
	const struct iovec iov = iovp;		const struct iovec iov = iovp;
	size_t base = *basep;		size_t base = *basep;

	do {		while (bytes) {
	int copy = min(bytes, iov->iov_len - base);		int copy = min(bytes, iov->iov_len - base);

	bytes -= copy;		bytes -= copy;
	@@ -96,7 +96,7 @@ filemap_set_next_iovec(const struct iovec *iovp, size_t basep, size_t bytes)
	iov++;		iov++;
	base = 0;		base = 0;
	}		}
	} while (bytes);		}
	*iovp = iov;		*iovp = iov;
	*basep = base;		*basep = base;
	}		}