From mboxrd@z Thu Jan 1 00:00:00 1970 From: Con Kolivas Subject: [PATCH] swswsup: return correct load_image error Date: Fri, 24 Mar 2006 16:00:55 +1100 References: <200603200234.01472.kernel@kolivas.org> <1142889937.441f1dd19e90f@vds.kolivas.org> <200603210022.32985.rjw@sisk.pl> In-Reply-To: <200603210022.32985.rjw@sisk.pl> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200603241600.56144.kernel@kolivas.org> Sender: owner-linux-mm@kvack.org Return-Path: To: "Rafael J. Wysocki" Cc: linux list , ck list , Andrew Morton , Pavel Machek , linux-mm@kvack.org List-ID: On Tuesday 21 March 2006 10:22, Rafael J. Wysocki wrote: > Basically, yes. swsusp.c and snapshot.c contain common functions, > disk.c and swap.c contain the code used by the built-in swsusp only, > and user.c contains the userland interface. If you want something to > be run by the built-in swsusp only, place it in disk.c. Ok. A quick look at the code in swap.c makes me wonder if we need this patch. Rafael? Cheers, Con --- If there's an error in load_image() we should return that without checking snapshot_image_loaded. Signed-off-by: Con Kolivas --- kernel/power/swap.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) Index: linux-2.6.16-mm1/kernel/power/swap.c =================================================================== --- linux-2.6.16-mm1.orig/kernel/power/swap.c 2006-03-24 15:04:13.000000000 +1100 +++ linux-2.6.16-mm1/kernel/power/swap.c 2006-03-24 15:55:30.000000000 +1100 @@ -454,10 +454,11 @@ static int load_image(struct swap_map_ha nr_pages++; } } while (ret > 0); - if (!error) + if (!error) { printk("\b\b\b\bdone\n"); - if (!snapshot_image_loaded(snapshot)) - error = -ENODATA; + if (!snapshot_image_loaded(snapshot)) + error = -ENODATA; + } return error; } -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org