From mboxrd@z Thu Jan  1 00:00:00 1970
From: Marco Stornelli <marco.stornelli@gmail.com>
Subject: [RFC] fsfreeze: moving from uniterruptible to killable
Date: Sun, 24 Mar 2013 10:10:59 +0100
Message-ID: <514EC323.7050002@gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-15
Content-Transfer-Encoding: 7bit
Cc: Linux Kernel <linux-kernel@vger.kernel.org>,
	Jan Kara <jack@suse.cz>
To: Linux FS Devel <linux-fsdevel@vger.kernel.org>
Return-path: <linux-fsdevel-owner@vger.kernel.org>
Received: from mail-wg0-f45.google.com ([74.125.82.45]:64294 "EHLO
	mail-wg0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1752859Ab3CXJSH (ORCPT
	<rfc822;linux-fsdevel@vger.kernel.org>);
	Sun, 24 Mar 2013 05:18:07 -0400
Sender: linux-fsdevel-owner@vger.kernel.org
List-ID: <linux-fsdevel.vger.kernel.org>

When a fs is frozen, a process can hang because we wait in
uniterruptible state. We give the user the possibility to kill the process.

Not-signed-off-by: Marco Stornelli <marco.stornelli@gmail.com>
---

--- fs/super.c.orig	2013-03-24 09:56:33.000000000 +0100
+++ fs/super.c	2013-03-24 09:58:41.000000000 +0100
@@ -1198,7 +1198,7 @@ retry:
 	if (unlikely(sb->s_writers.frozen >= level)) {
 		if (!wait)
 			return 0;
-		wait_event(sb->s_writers.wait_unfrozen,
+		wait_event_killable(sb->s_writers.wait_unfrozen,
 			   sb->s_writers.frozen < level);
 	}
 
@@ -1248,7 +1248,7 @@ static void sb_wait_write(struct super_b
 		 * of frozen and checking of the counter
 		 */
 		prepare_to_wait(&sb->s_writers.wait, &wait,
-				TASK_UNINTERRUPTIBLE);
+				 TASK_KILLABLE);
 
 		writers = percpu_counter_sum(&sb->s_writers.counter[level-1]);
 		if (writers)