aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCesar Eduardo Barros <cesarb@cesarb.net>2011-03-22 19:33:20 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-22 20:44:07 -0400
commit28b36bd741bd44db30e12b1048a659aa346e9b76 (patch)
tree7843ec3dd5f4db132c4808b08daf98d795074dea
parent730c0581c82dbc5be2f41a2d85bde6bad11bc8a4 (diff)
sys_swapon: remove initial value of name variable
Now there is nothing which jumps to the cleanup blocks before the name variable is set. There is no need to set it initially to NULL anymore. Signed-off-by: Cesar Eduardo Barros <cesarb@cesarb.net> Tested-by: Eric B Munson <emunson@mgebm.net> Acked-by: Eric B Munson <emunson@mgebm.net> Reviewed-by: Pekka Enberg <penberg@kernel.org> Reviewed-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Cc: Hugh Dickins <hughd@google.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--mm/swapfile.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/swapfile.c b/mm/swapfile.c
index 4d89c4c9336c..6f25ece88c4a 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -1892,7 +1892,7 @@ static struct swap_info_struct *alloc_swap_info(void)
1892SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags) 1892SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
1893{ 1893{
1894 struct swap_info_struct *p; 1894 struct swap_info_struct *p;
1895 char *name = NULL; 1895 char *name;
1896 struct block_device *bdev = NULL; 1896 struct block_device *bdev = NULL;
1897 struct file *swap_file = NULL; 1897 struct file *swap_file = NULL;
1898 struct address_space *mapping; 1898 struct address_space *mapping;