sys_swapon: simplify error flow in alloc_swap_info()

Since there is no cleanup to do, there is no reason to jump to a label.
Return directly instead.

Signed-off-by: Cesar Eduardo Barros <[email protected]>
Tested-by: Eric B Munson <[email protected]>
Acked-by: Eric B Munson <[email protected]>
Reviewed-by: Pekka Enberg <[email protected]>
Reviewed-by: KAMEZAWA Hiroyuki <[email protected]>
Cc: Hugh Dickins <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/mm/swapfile.c b/mm/swapfile.c
index 4d457d699c1f2c24e396e414ad714b085f149b87..4d89c4c9336c89f0b10a57876161cd190ba353a3 100644 (file)
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -1848,7 +1848,6 @@ static struct swap_info_struct *alloc_swap_info(void)
 {
        struct swap_info_struct *p;
        unsigned int type;
-       int error;
 
        p = kzalloc(sizeof(*p), GFP_KERNEL);
        if (!p)
@@ -1859,11 +1858,10 @@ static struct swap_info_struct *alloc_swap_info(void)
                if (!(swap_info[type]->flags & SWP_USED))
                        break;
        }
-       error = -EPERM;
        if (type >= MAX_SWAPFILES) {
                spin_unlock(&swap_lock);
                kfree(p);
-               goto out;
+               return ERR_PTR(-EPERM);
        }
        if (type >= nr_swapfiles) {
                p->type = type;
@@ -1889,9 +1887,6 @@ static struct swap_info_struct *alloc_swap_info(void)
        spin_unlock(&swap_lock);
 
        return p;
-
-out:
-       return ERR_PTR(error);
 }
 
 SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)