Skip to content

Commit

Permalink
swapfile: remove surplus whitespace
Browse files Browse the repository at this point in the history
Remove trailing whitespace from swapfile.c, and odd swap_show() alignment.

Signed-off-by: Hugh Dickins <hugh@veritas.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Nick Piggin <nickpiggin@yahoo.com.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Hugh Dickins authored and Linus Torvalds committed Jan 6, 2009
1 parent 22c6f8f commit 886bb7e
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions mm/swapfile.c
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ static inline unsigned long scan_swap_map(struct swap_info_struct *si)
unsigned long offset, last_in_cluster;
int latency_ration = LATENCY_LIMIT;

/*
/*
* We try to cluster swap pages by allocating them sequentially
* in swap. Once we've allocated SWAPFILE_CLUSTER pages this
* way, however, we resort to first-free allocation, starting
Expand Down Expand Up @@ -269,7 +269,7 @@ static struct swap_info_struct * swap_info_get(swp_entry_t entry)
printk(KERN_ERR "swap_free: %s%08lx\n", Bad_file, entry.val);
out:
return NULL;
}
}

static int swap_entry_free(struct swap_info_struct *p, unsigned long offset)
{
Expand Down Expand Up @@ -736,10 +736,10 @@ static int try_to_unuse(unsigned int type)
break;
}

/*
/*
* Get a page for the entry, using the existing swap
* cache page if there is one. Otherwise, get a clean
* page and read the swap into it.
* page and read the swap into it.
*/
swap_map = &si->swap_map[i];
entry = swp_entry(type, i);
Expand Down Expand Up @@ -1202,7 +1202,7 @@ asmlinkage long sys_swapoff(const char __user * specialfile)
char * pathname;
int i, type, prev;
int err;

if (!capable(CAP_SYS_ADMIN))
return -EPERM;

Expand Down Expand Up @@ -1395,12 +1395,12 @@ static int swap_show(struct seq_file *swap, void *v)
file = ptr->swap_file;
len = seq_path(swap, &file->f_path, " \t\n\\");
seq_printf(swap, "%*s%s\t%u\t%u\t%d\n",
len < 40 ? 40 - len : 1, " ",
S_ISBLK(file->f_path.dentry->d_inode->i_mode) ?
len < 40 ? 40 - len : 1, " ",
S_ISBLK(file->f_path.dentry->d_inode->i_mode) ?
"partition" : "file\t",
ptr->pages << (PAGE_SHIFT - 10),
ptr->inuse_pages << (PAGE_SHIFT - 10),
ptr->prio);
ptr->pages << (PAGE_SHIFT - 10),
ptr->inuse_pages << (PAGE_SHIFT - 10),
ptr->prio);
return 0;
}

Expand Down Expand Up @@ -1565,7 +1565,7 @@ asmlinkage long sys_swapon(const char __user * specialfile, int swap_flags)
error = -EINVAL;
goto bad_swap;
}

switch (swap_header_version) {
case 1:
printk(KERN_ERR "version 0 swap is no longer supported. "
Expand Down

0 comments on commit 886bb7e

Please sign in to comment.