diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-09-25 08:51:50 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-09-25 08:51:50 -0400 |
| commit | e5baa396af7560382d2cf3f0871d616b61fc284c (patch) | |
| tree | 6afc166894b8c8b3b2cf6add72a726be14ae2443 /mm/swapfile.c | |
| parent | d6a4c847e43c851cc0ddf73087a730227223f989 (diff) | |
| parent | ef6bd6eb90ad72ee8ee7ba8b271f27102e9a90c1 (diff) | |
Merge from Linus' tree.
Diffstat (limited to 'mm/swapfile.c')
| -rw-r--r-- | mm/swapfile.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mm/swapfile.c b/mm/swapfile.c index 0184f510aace..1dcaeda039f4 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c | |||
| @@ -1381,6 +1381,7 @@ asmlinkage long sys_swapon(const char __user * specialfile, int swap_flags) | |||
| 1381 | error = bd_claim(bdev, sys_swapon); | 1381 | error = bd_claim(bdev, sys_swapon); |
| 1382 | if (error < 0) { | 1382 | if (error < 0) { |
| 1383 | bdev = NULL; | 1383 | bdev = NULL; |
| 1384 | error = -EINVAL; | ||
| 1384 | goto bad_swap; | 1385 | goto bad_swap; |
| 1385 | } | 1386 | } |
| 1386 | p->old_block_size = block_size(bdev); | 1387 | p->old_block_size = block_size(bdev); |