From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754630Ab1BFXq0 (ORCPT ); Sun, 6 Feb 2011 18:46:26 -0500 Received: from 1wt.eu ([62.212.114.60]:60324 "EHLO 1wt.eu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754400Ab1BFXqY (ORCPT ); Sun, 6 Feb 2011 18:46:24 -0500 Message-Id: <20110206232253.124757327@pcw.home.local> User-Agent: quilt/0.48-1 Date: Mon, 07 Feb 2011 00:23:06 +0100 From: Willy Tarreau To: linux-kernel@vger.kernel.org, stable@kernel.org, stable-review@kernel.org Cc: Takashi Iwai , "Rafael J. Wysocki" , Greg Kroah-Hartman , Willy Tarreau Subject: [PATCH 14/23] PM / Hibernate: Fix PM_POST_* notification with user-space suspend In-Reply-To: <4beed4da27f06efb2c13d6ed48850634@local> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 2.6.27.58-stable review patch. If anyone has any objections, please let us know. ------------------ From: Takashi Iwai commit 1497dd1d29c6a53fcd3c80f7ac8d0e0239e7389e upstream. The user-space hibernation sends a wrong notification after the image restoration because of thinko for the file flag check. RDONLY corresponds to hibernation and WRONLY to restoration, confusingly. Signed-off-by: Takashi Iwai Signed-off-by: Rafael J. Wysocki Signed-off-by: Greg Kroah-Hartman Signed-off-by: Willy Tarreau --- kernel/power/user.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: longterm-2.6.27/kernel/power/user.c =================================================================== --- longterm-2.6.27.orig/kernel/power/user.c 2011-01-29 11:19:14.719063850 +0100 +++ longterm-2.6.27/kernel/power/user.c 2011-01-29 11:27:16.799064365 +0100 @@ -129,7 +129,7 @@ free_all_swap_pages(data->swap); if (data->frozen) thaw_processes(); - pm_notifier_call_chain(data->mode == O_WRONLY ? + pm_notifier_call_chain(data->mode == O_RDONLY ? PM_POST_HIBERNATION : PM_POST_RESTORE); atomic_inc(&snapshot_device_available);