summaryrefslogtreecommitdiffstats
path: root/mm/swapfile.c
diff options
context:
space:
mode:
authorCesar Eduardo Barros <cesarb@cesarb.net>2011-03-23 00:33:20 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-23 01:44:07 +0100
commit28b36bd741bd44db30e12b1048a659aa346e9b76 (patch)
tree7843ec3dd5f4db132c4808b08daf98d795074dea /mm/swapfile.c
parentsys_swapon: simplify error flow in alloc_swap_info() (diff)
downloadlinux-28b36bd741bd44db30e12b1048a659aa346e9b76.tar.xz
linux-28b36bd741bd44db30e12b1048a659aa346e9b76.zip
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>
Diffstat (limited to 'mm/swapfile.c')
-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)
SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
{
struct swap_info_struct *p;
- char *name = NULL;
+ char *name;
struct block_device *bdev = NULL;
struct file *swap_file = NULL;
struct address_space *mapping;