lkml.org 
[lkml]   [2011]   [Mar]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCHv2 20/24] sys_swapon: simplify error flow in setup_swap_map_and_extents
    Date
    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 <cesarb@cesarb.net>
    Tested-by: Eric B Munson <emunson@mgebm.net>
    Acked-by: Eric B Munson <emunson@mgebm.net>
    ---
    mm/swapfile.c | 19 +++++--------------
    1 files changed, 5 insertions(+), 14 deletions(-)

    diff --git a/mm/swapfile.c b/mm/swapfile.c
    index 26eb84a..5f6df81 100644
    --- a/mm/swapfile.c
    +++ b/mm/swapfile.c
    @@ -1998,7 +1998,6 @@ static int setup_swap_map_and_extents(struct swap_info_struct *p,
    sector_t *span)
    {
    int i;
    - int error;
    unsigned int nr_good_pages;
    int nr_extents;

    @@ -2006,10 +2005,8 @@ static int setup_swap_map_and_extents(struct swap_info_struct *p,

    for (i = 0; i < swap_header->info.nr_badpages; i++) {
    unsigned int page_nr = swap_header->info.badpages[i];
    - if (page_nr == 0 || page_nr > swap_header->info.last_page) {
    - error = -EINVAL;
    - goto bad_swap;
    - }
    + if (page_nr == 0 || page_nr > swap_header->info.last_page)
    + return -EINVAL;
    if (page_nr < maxpages) {
    swap_map[page_nr] = SWAP_MAP_BAD;
    nr_good_pages--;
    @@ -2021,22 +2018,16 @@ static int setup_swap_map_and_extents(struct swap_info_struct *p,
    p->max = maxpages;
    p->pages = nr_good_pages;
    nr_extents = setup_swap_extents(p, span);
    - if (nr_extents < 0) {
    - error = nr_extents;
    - goto bad_swap;
    - }
    + if (nr_extents < 0)
    + return nr_extents;
    nr_good_pages = p->pages;
    }
    if (!nr_good_pages) {
    printk(KERN_WARNING "Empty swap-file\n");
    - error = -EINVAL;
    - goto bad_swap;
    + return -EINVAL;
    }

    return nr_extents;
    -
    -bad_swap:
    - return error;
    }

    SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
    --
    1.7.4


    \
     
     \ /
      Last update: 2011-03-06 12:19    [W:0.019 / U:60.672 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site