From 61a4d2012998dcc9aa15c00c4154469d9039c3a1 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Mon, 8 Oct 2007 13:21:10 -0400
Subject: [PATCH] --- yaml --- r: 117551 b: refs/heads/master c:
 c2dd0dae185423fb243b13d490c3fcfaa18ff333 h: refs/heads/master i:   117549:
 b2439468edb97aaff94553bf2ebca9a02e6db40d   117547:
 81d1a0634bae40cfe67da767172efdd1de229dd2   117543:
 d2c071f53c0c6ccb6aa3a8d30ce3d514cb1ce5e2   117535:
 3af16d68b575ea584e593ad8cf2b24bc8990242d v: v3

---
 [refs]                     | 2 +-
 trunk/kernel/power/disk.c  | 2 +-
 trunk/kernel/power/power.h | 2 +-
 trunk/kernel/power/swap.c  | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 62ff7c47792e..6b74fdf9f812 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 30c40d2c01f68c7eb1a41ab3552bdaf5dbf300d4
+refs/heads/master: c2dd0dae185423fb243b13d490c3fcfaa18ff333
diff --git a/trunk/kernel/power/disk.c b/trunk/kernel/power/disk.c
index 331f9836383f..c9d74083746f 100644
--- a/trunk/kernel/power/disk.c
+++ b/trunk/kernel/power/disk.c
@@ -651,7 +651,7 @@ static int software_resume(void)
 	pr_debug("PM: Preparing processes for restore.\n");
 	error = prepare_processes();
 	if (error) {
-		swsusp_close();
+		swsusp_close(FMODE_READ);
 		goto Done;
 	}
 
diff --git a/trunk/kernel/power/power.h b/trunk/kernel/power/power.h
index acc0c101dbd5..46b5ec7a3afb 100644
--- a/trunk/kernel/power/power.h
+++ b/trunk/kernel/power/power.h
@@ -153,7 +153,7 @@ extern int swsusp_shrink_memory(void);
 extern void swsusp_free(void);
 extern int swsusp_read(unsigned int *flags_p);
 extern int swsusp_write(unsigned int flags);
-extern void swsusp_close(void);
+extern void swsusp_close(fmode_t);
 
 struct timeval;
 /* kernel/power/swsusp.c */
diff --git a/trunk/kernel/power/swap.c b/trunk/kernel/power/swap.c
index 7b9d611c1106..178b001a4f17 100644
--- a/trunk/kernel/power/swap.c
+++ b/trunk/kernel/power/swap.c
@@ -426,7 +426,7 @@ int swsusp_write(unsigned int flags)
 
 	release_swap_writer(&handle);
  out:
-	swsusp_close();
+	swsusp_close(FMODE_WRITE);
 	return error;
 }
 
@@ -626,14 +626,14 @@ int swsusp_check(void)
  *	swsusp_close - close swap device.
  */
 
-void swsusp_close(void)
+void swsusp_close(fmode_t mode)
 {
 	if (IS_ERR(resume_bdev)) {
 		pr_debug("PM: Image device not initialised\n");
 		return;
 	}
 
-	blkdev_put(resume_bdev, 0); /* move up */
+	blkdev_put(resume_bdev, mode); /* move up */
 }
 
 static int swsusp_header_init(void)