From: Hugh Dickins <hugh@veritas.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-mm@kvack.org
Subject: [PATCH 3/9] swapfile: remove surplus whitespace
Date: Tue, 25 Nov 2008 21:37:51 +0000 (GMT) [thread overview]
Message-ID: <Pine.LNX.4.64.0811252137080.17555@blonde.site> (raw)
In-Reply-To: <Pine.LNX.4.64.0811252132580.17555@blonde.site>
Remove trailing whitespace from swapfile.c, and odd swap_show() alignment.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
---
mm/swapfile.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
--- swapfile2/mm/swapfile.c 2008-11-25 12:41:19.000000000 +0000
+++ swapfile3/mm/swapfile.c 2008-11-25 12:41:24.000000000 +0000
@@ -92,7 +92,7 @@ static inline unsigned long scan_swap_ma
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
@@ -269,7 +269,7 @@ bad_nofile:
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)
{
@@ -736,10 +736,10 @@ static int try_to_unuse(unsigned int typ
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);
@@ -1202,7 +1202,7 @@ asmlinkage long sys_swapoff(const char _
char * pathname;
int i, type, prev;
int err;
-
+
if (!capable(CAP_SYS_ADMIN))
return -EPERM;
@@ -1395,12 +1395,12 @@ static int swap_show(struct seq_file *sw
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;
}
@@ -1556,7 +1556,7 @@ asmlinkage long sys_swapon(const char __
error = -EINVAL;
goto bad_swap;
}
-
+
switch (swap_header_version) {
case 1:
printk(KERN_ERR "version 0 swap is no longer supported. "
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2008-11-25 21:37 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-25 21:35 [PATCH 0/9] swapfile: cleanups and solidstate mods Hugh Dickins
2008-11-25 21:36 ` [PATCH 1/9] swapfile: swapon needs larger size type Hugh Dickins
2008-11-25 21:37 ` [PATCH 2/9] swapfile: remove SWP_ACTIVE mask Hugh Dickins
2008-11-25 21:37 ` Hugh Dickins [this message]
2008-11-25 21:39 ` [PATCH 4/9] swapfile: remove v0 SWAP-SPACE message Hugh Dickins
2008-11-25 21:40 ` [PATCH 5/9] swapfile: rearrange scan and swap_info Hugh Dickins
2008-11-25 21:44 ` [PATCH 6/9] swapfile: swapon use discard (trim) Hugh Dickins
2008-11-25 21:46 ` [PATCH 7/9] swapfile: swap allocation use discard Hugh Dickins
2008-12-01 0:29 ` [PATCH 10/9] swapfile: change discard pgoff_t to sector_t Hugh Dickins
2008-12-03 0:47 ` Andrew Morton
2008-12-03 12:52 ` Hugh Dickins
2008-11-25 21:46 ` [PATCH 8/9] swapfile: swapon randomize if nonrot Hugh Dickins
2008-11-26 1:20 ` Andrew Morton
2008-11-26 3:38 ` Matthew Wilcox
2008-12-01 0:32 ` [PATCH 11/9] swapfile: let others seed random Hugh Dickins
2008-11-25 21:47 ` [PATCH 9/9] swapfile: swap allocation cycle if nonrot Hugh Dickins
2008-11-26 1:17 ` [PATCH 6/9] swapfile: swapon use discard (trim) Andrew Morton
2008-11-26 6:02 ` Hugh Dickins
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Pine.LNX.4.64.0811252137080.17555@blonde.site \
--to=hugh@veritas.com \
--cc=akpm@linux-foundation.org \
--cc=linux-mm@kvack.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox