diff options
author | Michael Holzheu <holzheu@de.ibm.com> | 2008-12-25 07:39:39 -0500 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2008-12-25 07:39:21 -0500 |
commit | f55495ba1a56adba57ea7d3164a766d83a631c58 (patch) | |
tree | 92ee8bdc0ce2371a123940a8943ec7803593c73e /arch/s390/hypfs/inode.c | |
parent | feab6501d84f7e2f75cf0f5c7d43341431904374 (diff) |
[S390] convert hypfs printks to pr_xxx macros.
Signed-off-by: Michael Holzheu <holzheu@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/hypfs/inode.c')
-rw-r--r-- | arch/s390/hypfs/inode.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/arch/s390/hypfs/inode.c b/arch/s390/hypfs/inode.c index 36313801cd5c..65e93c7ce784 100644 --- a/arch/s390/hypfs/inode.c +++ b/arch/s390/hypfs/inode.c | |||
@@ -2,10 +2,13 @@ | |||
2 | * arch/s390/hypfs/inode.c | 2 | * arch/s390/hypfs/inode.c |
3 | * Hypervisor filesystem for Linux on s390. | 3 | * Hypervisor filesystem for Linux on s390. |
4 | * | 4 | * |
5 | * Copyright (C) IBM Corp. 2006 | 5 | * Copyright IBM Corp. 2006, 2008 |
6 | * Author(s): Michael Holzheu <holzheu@de.ibm.com> | 6 | * Author(s): Michael Holzheu <holzheu@de.ibm.com> |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #define KMSG_COMPONENT "hypfs" | ||
10 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt | ||
11 | |||
9 | #include <linux/types.h> | 12 | #include <linux/types.h> |
10 | #include <linux/errno.h> | 13 | #include <linux/errno.h> |
11 | #include <linux/fs.h> | 14 | #include <linux/fs.h> |
@@ -200,7 +203,7 @@ static ssize_t hypfs_aio_write(struct kiocb *iocb, const struct iovec *iov, | |||
200 | else | 203 | else |
201 | rc = hypfs_diag_create_files(sb, sb->s_root); | 204 | rc = hypfs_diag_create_files(sb, sb->s_root); |
202 | if (rc) { | 205 | if (rc) { |
203 | printk(KERN_ERR "hypfs: Update failed\n"); | 206 | pr_err("Updating the hypfs tree failed\n"); |
204 | hypfs_delete_tree(sb->s_root); | 207 | hypfs_delete_tree(sb->s_root); |
205 | goto out; | 208 | goto out; |
206 | } | 209 | } |
@@ -252,8 +255,7 @@ static int hypfs_parse_options(char *options, struct super_block *sb) | |||
252 | break; | 255 | break; |
253 | case opt_err: | 256 | case opt_err: |
254 | default: | 257 | default: |
255 | printk(KERN_ERR "hypfs: Unrecognized mount option " | 258 | pr_err("%s is not a valid mount option\n", str); |
256 | "\"%s\" or missing value\n", str); | ||
257 | return -EINVAL; | 259 | return -EINVAL; |
258 | } | 260 | } |
259 | } | 261 | } |
@@ -317,7 +319,7 @@ static int hypfs_fill_super(struct super_block *sb, void *data, int silent) | |||
317 | } | 319 | } |
318 | hypfs_update_update(sb); | 320 | hypfs_update_update(sb); |
319 | sb->s_root = root_dentry; | 321 | sb->s_root = root_dentry; |
320 | printk(KERN_INFO "hypfs: Hypervisor filesystem mounted\n"); | 322 | pr_info("Hypervisor filesystem mounted\n"); |
321 | return 0; | 323 | return 0; |
322 | 324 | ||
323 | err_tree: | 325 | err_tree: |
@@ -513,7 +515,7 @@ fail_sysfs: | |||
513 | if (!MACHINE_IS_VM) | 515 | if (!MACHINE_IS_VM) |
514 | hypfs_diag_exit(); | 516 | hypfs_diag_exit(); |
515 | fail_diag: | 517 | fail_diag: |
516 | printk(KERN_ERR "hypfs: Initialization failed with rc = %i.\n", rc); | 518 | pr_err("Initialization of hypfs failed with rc=%i\n", rc); |
517 | return rc; | 519 | return rc; |
518 | } | 520 | } |
519 | 521 | ||