Commit 4ff277f9 authored by Jiri Slaby's avatar Jiri Slaby Committed by Rafael J. Wysocki

PM / Hibernate: Fix error handling in save_image()

There are too many retval variables in save_image(). Thus error return
value from snapshot_read_next() may be ignored and only part of the
snapshot (successfully) written.

Remove 'error' variable, invert the condition in the do-while loop
and convert the loop to use only 'ret' variable.

Switch the rest of the function to consider only 'ret'.

Also make sure we end printed line by \n if an error occurs.
Signed-off-by: default avatarJiri Slaby <jirislaby@gmail.com>
Acked-by: default avatarPavel Machek <pavel@ucw.cz>
Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
parent 76b57e61
...@@ -314,7 +314,6 @@ static int save_image(struct swap_map_handle *handle, ...@@ -314,7 +314,6 @@ static int save_image(struct swap_map_handle *handle,
{ {
unsigned int m; unsigned int m;
int ret; int ret;
int error = 0;
int nr_pages; int nr_pages;
int err2; int err2;
struct bio *bio; struct bio *bio;
...@@ -329,26 +328,27 @@ static int save_image(struct swap_map_handle *handle, ...@@ -329,26 +328,27 @@ static int save_image(struct swap_map_handle *handle,
nr_pages = 0; nr_pages = 0;
bio = NULL; bio = NULL;
do_gettimeofday(&start); do_gettimeofday(&start);
do { while (1) {
ret = snapshot_read_next(snapshot, PAGE_SIZE); ret = snapshot_read_next(snapshot, PAGE_SIZE);
if (ret > 0) { if (ret <= 0)
error = swap_write_page(handle, data_of(*snapshot), break;
&bio); ret = swap_write_page(handle, data_of(*snapshot), &bio);
if (error) if (ret)
break; break;
if (!(nr_pages % m)) if (!(nr_pages % m))
printk("\b\b\b\b%3d%%", nr_pages / m); printk("\b\b\b\b%3d%%", nr_pages / m);
nr_pages++; nr_pages++;
} }
} while (ret > 0);
err2 = wait_on_bio_chain(&bio); err2 = wait_on_bio_chain(&bio);
do_gettimeofday(&stop); do_gettimeofday(&stop);
if (!error) if (!ret)
error = err2; ret = err2;
if (!error) if (!ret)
printk("\b\b\b\bdone\n"); printk("\b\b\b\bdone\n");
else
printk("\n");
swsusp_show_speed(&start, &stop, nr_to_write, "Wrote"); swsusp_show_speed(&start, &stop, nr_to_write, "Wrote");
return error; return ret;
} }
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment