Skip to content

Commit 0e72cea

Browse files
Alexander Gordeevgregkh
Alexander Gordeev
authored andcommitted
s390/crash: make copy_oldmem_page() return number of bytes copied
[ Upstream commit af2debd ] Callback copy_oldmem_page() returns either error code or zero. Instead, it should return the error code or number of bytes copied. Fixes: df9694c ("s390/dump: streamline oldmem copy functions") Reviewed-by: Alexander Egorenkov <[email protected]> Tested-by: Alexander Egorenkov <[email protected]> Signed-off-by: Alexander Gordeev <[email protected]> Signed-off-by: Sasha Levin <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 27702e6 commit 0e72cea

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

arch/s390/kernel/crash_dump.c

+4-3
Original file line numberDiff line numberDiff line change
@@ -233,9 +233,10 @@ ssize_t copy_oldmem_page(struct iov_iter *iter, unsigned long pfn, size_t csize,
233233
rc = copy_oldmem_user(iter->iov->iov_base, src, csize);
234234
else
235235
rc = copy_oldmem_kernel(iter->kvec->iov_base, src, csize);
236-
if (!rc)
237-
iov_iter_advance(iter, csize);
238-
return rc;
236+
if (rc < 0)
237+
return rc;
238+
iov_iter_advance(iter, csize);
239+
return csize;
239240
}
240241

241242
/*

0 commit comments

Comments
 (0)