From cceb77bf8f69b1389b0c0b2c35761f8beb74c2b2 Mon Sep 17 00:00:00 2001
From: Rob Landley <rob@landley.net>
Date: Thu, 22 Sep 2005 21:44:27 -0700
Subject: [PATCH] --- yaml --- r: 9255 b: refs/heads/master c:
 f7b3a4359b25311fb5894c8809478a2df6bed480 h: refs/heads/master i:   9253:
 fbdc5456cc5bd78648a1eabab051dc75fdacc092   9251:
 8eafb29220ad4dd0ddb4e2c83cb2a3ae127411f3   9247:
 c5122907223e7e66d916c6b79f1c323c7f399bda v: v3

---
 [refs]              | 2 +-
 trunk/mm/swapfile.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index abb64bb682de..23fdd0ae9c6b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8bdac5d1ed892da54b6b2069e50a47b3aa39460f
+refs/heads/master: f7b3a4359b25311fb5894c8809478a2df6bed480
diff --git a/trunk/mm/swapfile.c b/trunk/mm/swapfile.c
index 0184f510aace..1dcaeda039f4 100644
--- a/trunk/mm/swapfile.c
+++ b/trunk/mm/swapfile.c
@@ -1381,6 +1381,7 @@ asmlinkage long sys_swapon(const char __user * specialfile, int swap_flags)
 		error = bd_claim(bdev, sys_swapon);
 		if (error < 0) {
 			bdev = NULL;
+			error = -EINVAL;
 			goto bad_swap;
 		}
 		p->old_block_size = block_size(bdev);