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);