Commit 7b84b665 authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle) Committed by Al Viro
Browse files

fs: Allow a NULL pos pointer to __kernel_read 



Match the behaviour of new_sync_read() and __kernel_write().

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 4c207ef4

fs/read_write.c

+3 −2
Original line number Diff line number Diff line
@@ -449,10 +449,11 @@ ssize_t __kernel_read(struct file *file, void *buf, size_t count, loff_t *pos) 
		return warn_unsupported(file, "read");



	init_sync_kiocb(&kiocb, file);

	kiocb.ki_pos = *pos;

	kiocb.ki_pos = pos ? *pos : 0;

	iov_iter_kvec(&iter, READ, &iov, 1, iov.iov_len);

	ret = file->f_op->read_iter(&kiocb, &iter);

	if (ret > 0) {

		if (pos)

			*pos = kiocb.ki_pos;

		fsnotify_access(file);

		add_rchar(current, ret);