提交 886bb7e9 编写于 作者: H Hugh Dickins 提交者: Linus Torvalds

swapfile: remove surplus whitespace

Remove trailing whitespace from swapfile.c, and odd swap_show() alignment.
Signed-off-by: NHugh Dickins <hugh@veritas.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Nick Piggin <nickpiggin@yahoo.com.au>
Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
上级 22c6f8fd
...@@ -92,7 +92,7 @@ static inline unsigned long scan_swap_map(struct swap_info_struct *si) ...@@ -92,7 +92,7 @@ static inline unsigned long scan_swap_map(struct swap_info_struct *si)
unsigned long offset, last_in_cluster; unsigned long offset, last_in_cluster;
int latency_ration = LATENCY_LIMIT; int latency_ration = LATENCY_LIMIT;
/* /*
* We try to cluster swap pages by allocating them sequentially * We try to cluster swap pages by allocating them sequentially
* in swap. Once we've allocated SWAPFILE_CLUSTER pages this * in swap. Once we've allocated SWAPFILE_CLUSTER pages this
* way, however, we resort to first-free allocation, starting * way, however, we resort to first-free allocation, starting
...@@ -269,7 +269,7 @@ static struct swap_info_struct * swap_info_get(swp_entry_t entry) ...@@ -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); printk(KERN_ERR "swap_free: %s%08lx\n", Bad_file, entry.val);
out: out:
return NULL; return NULL;
} }
static int swap_entry_free(struct swap_info_struct *p, unsigned long offset) static int swap_entry_free(struct swap_info_struct *p, unsigned long offset)
{ {
...@@ -736,10 +736,10 @@ static int try_to_unuse(unsigned int type) ...@@ -736,10 +736,10 @@ static int try_to_unuse(unsigned int type)
break; break;
} }
/* /*
* Get a page for the entry, using the existing swap * Get a page for the entry, using the existing swap
* cache page if there is one. Otherwise, get a clean * 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]; swap_map = &si->swap_map[i];
entry = swp_entry(type, i); entry = swp_entry(type, i);
...@@ -1202,7 +1202,7 @@ asmlinkage long sys_swapoff(const char __user * specialfile) ...@@ -1202,7 +1202,7 @@ asmlinkage long sys_swapoff(const char __user * specialfile)
char * pathname; char * pathname;
int i, type, prev; int i, type, prev;
int err; int err;
if (!capable(CAP_SYS_ADMIN)) if (!capable(CAP_SYS_ADMIN))
return -EPERM; return -EPERM;
...@@ -1395,12 +1395,12 @@ static int swap_show(struct seq_file *swap, void *v) ...@@ -1395,12 +1395,12 @@ static int swap_show(struct seq_file *swap, void *v)
file = ptr->swap_file; file = ptr->swap_file;
len = seq_path(swap, &file->f_path, " \t\n\\"); len = seq_path(swap, &file->f_path, " \t\n\\");
seq_printf(swap, "%*s%s\t%u\t%u\t%d\n", seq_printf(swap, "%*s%s\t%u\t%u\t%d\n",
len < 40 ? 40 - len : 1, " ", len < 40 ? 40 - len : 1, " ",
S_ISBLK(file->f_path.dentry->d_inode->i_mode) ? S_ISBLK(file->f_path.dentry->d_inode->i_mode) ?
"partition" : "file\t", "partition" : "file\t",
ptr->pages << (PAGE_SHIFT - 10), ptr->pages << (PAGE_SHIFT - 10),
ptr->inuse_pages << (PAGE_SHIFT - 10), ptr->inuse_pages << (PAGE_SHIFT - 10),
ptr->prio); ptr->prio);
return 0; return 0;
} }
...@@ -1565,7 +1565,7 @@ asmlinkage long sys_swapon(const char __user * specialfile, int swap_flags) ...@@ -1565,7 +1565,7 @@ asmlinkage long sys_swapon(const char __user * specialfile, int swap_flags)
error = -EINVAL; error = -EINVAL;
goto bad_swap; goto bad_swap;
} }
switch (swap_header_version) { switch (swap_header_version) {
case 1: case 1:
printk(KERN_ERR "version 0 swap is no longer supported. " printk(KERN_ERR "version 0 swap is no longer supported. "
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册