redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

mm/swapfile.c: convert to pr_foo() 

A few 80-col gymnastics were cleaned up as a result.

Cc: Hugh Dickins <hughd@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
hifive-unleashed-5.1
Andrew Morton 2013-09-11 14:20:17 -07:00 committed by Linus Torvalds
parent d6bbbd29b1
commit 465c47fd8d
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
mm/swapfile.c
View File

@ -527,16 +527,16 @@ static struct swap_info_struct *swap_info_get(swp_entry_t entry)
return p; return p;
bad_free: bad_free:
printk(KERN_ERR "swap_free: %s%08lx\n", Unused_offset, entry.val); pr_err("swap_free: %s%08lx\n", Unused_offset, entry.val);
goto out; goto out;
bad_offset: bad_offset:
printk(KERN_ERR "swap_free: %s%08lx\n", Bad_offset, entry.val); pr_err("swap_free: %s%08lx\n", Bad_offset, entry.val);
goto out; goto out;
bad_device: bad_device:
printk(KERN_ERR "swap_free: %s%08lx\n", Unused_file, entry.val); pr_err("swap_free: %s%08lx\n", Unused_file, entry.val);
goto out; goto out;
bad_nofile: bad_nofile:
printk(KERN_ERR "swap_free: %s%08lx\n", Bad_file, entry.val); pr_err("swap_free: %s%08lx\n", Bad_file, entry.val);
out: out:
return NULL; return NULL;
} }
@ -1929,7 +1929,7 @@ static unsigned long read_swap_header(struct swap_info_struct *p,
unsigned long last_page; unsigned long last_page;
if (memcmp("SWAPSPACE2", swap_header->magic.magic, 10)) { if (memcmp("SWAPSPACE2", swap_header->magic.magic, 10)) {
printk(KERN_ERR "Unable to find swap-space signature\n"); pr_err("Unable to find swap-space signature\n");
return 0; return 0;
} }
@ -1943,9 +1943,8 @@ static unsigned long read_swap_header(struct swap_info_struct *p,
} }
/* Check the swap header's sub-version */ /* Check the swap header's sub-version */
if (swap_header->info.version != 1) { if (swap_header->info.version != 1) {
printk(KERN_WARNING pr_warn("Unable to handle swap header version %d\n",
"Unable to handle swap header version %d\n", swap_header->info.version);
swap_header->info.version);
return 0; return 0;
} }
@ -1971,8 +1970,7 @@ static unsigned long read_swap_header(struct swap_info_struct *p,
swp_entry_to_pte(swp_entry(0, ~0UL)))) + 1; swp_entry_to_pte(swp_entry(0, ~0UL)))) + 1;
last_page = swap_header->info.last_page; last_page = swap_header->info.last_page;
if (last_page > maxpages) { if (last_page > maxpages) {
printk(KERN_WARNING pr_warn("Truncating oversized swap area, only using %luk out of %luk\n",
"Truncating oversized swap area, only using %luk out of %luk\n",
maxpages << (PAGE_SHIFT - 10), maxpages << (PAGE_SHIFT - 10),
last_page << (PAGE_SHIFT - 10)); last_page << (PAGE_SHIFT - 10));
} }
@ -1988,8 +1986,7 @@ static unsigned long read_swap_header(struct swap_info_struct *p,
return 0; return 0;
swapfilepages = i_size_read(inode) >> PAGE_SHIFT; swapfilepages = i_size_read(inode) >> PAGE_SHIFT;
if (swapfilepages && maxpages > swapfilepages) { if (swapfilepages && maxpages > swapfilepages) {
printk(KERN_WARNING pr_warn("Swap area shorter than signature indicates\n");
"Swap area shorter than signature indicates\n");
return 0; return 0;
} }
if (swap_header->info.nr_badpages && S_ISREG(inode->i_mode)) if (swap_header->info.nr_badpages && S_ISREG(inode->i_mode))
@ -2032,7 +2029,7 @@ static int setup_swap_map_and_extents(struct swap_info_struct *p,
nr_good_pages = p->pages; nr_good_pages = p->pages;
} }
if (!nr_good_pages) { if (!nr_good_pages) {
printk(KERN_WARNING "Empty swap-file\n"); pr_warn("Empty swap-file\n");
return -EINVAL; return -EINVAL;
} }
@ -2186,8 +2183,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
if (p->flags & SWP_AREA_DISCARD) { if (p->flags & SWP_AREA_DISCARD) {
int err = discard_swap(p); int err = discard_swap(p);
if (unlikely(err)) if (unlikely(err))
printk(KERN_ERR pr_err("swapon: discard_swap(%p): %d\n",
"swapon: discard_swap(%p): %d\n",
p, err); p, err);
} }
} }
@ -2200,7 +2196,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
(swap_flags & SWAP_FLAG_PRIO_MASK) >> SWAP_FLAG_PRIO_SHIFT; (swap_flags & SWAP_FLAG_PRIO_MASK) >> SWAP_FLAG_PRIO_SHIFT;
enable_swap_info(p, prio, swap_map, frontswap_map); enable_swap_info(p, prio, swap_map, frontswap_map);
printk(KERN_INFO "Adding %uk swap on %s. " pr_info("Adding %uk swap on %s. "
"Priority:%d extents:%d across:%lluk %s%s%s%s%s\n", "Priority:%d extents:%d across:%lluk %s%s%s%s%s\n",
p->pages<<(PAGE_SHIFT-10), name->name, p->prio, p->pages<<(PAGE_SHIFT-10), name->name, p->prio,
nr_extents, (unsigned long long)span<<(PAGE_SHIFT-10), nr_extents, (unsigned long long)span<<(PAGE_SHIFT-10),
@ -2334,7 +2330,7 @@ out:
return err; return err;
bad_file: bad_file:
printk(KERN_ERR "swap_dup: %s%08lx\n", Bad_file, entry.val); pr_err("swap_dup: %s%08lx\n", Bad_file, entry.val);
goto out; goto out;
} }