aboutsummaryrefslogtreecommitdiff
path: root/fs/coda
diff options
context:
space:
mode:
authorFabian Frederick <fabf@skynet.be>2014-06-06 14:36:19 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-06-06 16:08:09 -0700
commitf38cfb2564f5fead53eebd9617258ee0376b1906 (patch)
tree6905553c7bae9f09a348dcf8d44a84847c50d464 /fs/coda
parentd9b4b3195a06e646c357f6108a424569b1a920d9 (diff)
downloadlinux-stericsson-f38cfb2564f5fead53eebd9617258ee0376b1906.tar.gz
fs/coda: logging prefix uniformization
- Add pr_fmt based on module name. - Remove Coda: coda: from pr_foo() Signed-off-by: Fabian Frederick <fabf@skynet.be> Cc: Jan Harkes <jaharkes@cs.cmu.edu> Cc: Joe Perches <joe@perches.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/coda')
-rw-r--r--fs/coda/coda_linux.h6
-rw-r--r--fs/coda/dir.c2
-rw-r--r--fs/coda/inode.c2
-rw-r--r--fs/coda/psdev.c6
-rw-r--r--fs/coda/upcall.c6
5 files changed, 14 insertions, 8 deletions
diff --git a/fs/coda/coda_linux.h b/fs/coda/coda_linux.h
index a3bf7a873ad2..d42b725b1d21 100644
--- a/fs/coda/coda_linux.h
+++ b/fs/coda/coda_linux.h
@@ -12,6 +12,12 @@
#ifndef _LINUX_CODA_FS
#define _LINUX_CODA_FS
+#ifdef pr_fmt
+#undef pr_fmt
+#endif
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/kernel.h>
#include <linux/param.h>
#include <linux/mm.h>
diff --git a/fs/coda/dir.c b/fs/coda/dir.c
index bdd34df79c88..cf2735c2ba6f 100644
--- a/fs/coda/dir.c
+++ b/fs/coda/dir.c
@@ -589,7 +589,7 @@ int coda_revalidate_inode(struct inode *inode)
coda_vattr_to_iattr(inode, &attr);
if ((old_mode & S_IFMT) != (inode->i_mode & S_IFMT)) {
- pr_warn("Coda: inode %ld, fid %s changed type!\n",
+ pr_warn("inode %ld, fid %s changed type!\n",
inode->i_ino, coda_f2s(&(cii->c_fid)));
}
diff --git a/fs/coda/inode.c b/fs/coda/inode.c
index b87d49fea623..b5ee5903c7f7 100644
--- a/fs/coda/inode.c
+++ b/fs/coda/inode.c
@@ -247,7 +247,7 @@ static void coda_put_super(struct super_block *sb)
sb->s_fs_info = NULL;
mutex_unlock(&vcp->vc_mutex);
- pr_info("Coda: Bye bye.\n");
+ pr_info("Bye bye.\n");
}
static void coda_evict_inode(struct inode *inode)
diff --git a/fs/coda/psdev.c b/fs/coda/psdev.c
index accddf6e2718..39ebb148d0d8 100644
--- a/fs/coda/psdev.c
+++ b/fs/coda/psdev.c
@@ -120,7 +120,7 @@ static ssize_t coda_psdev_write(struct file *file, const char __user *buf,
goto out;
}
if ( nbytes > size ) {
- pr_warn("Coda: downcall opc %d, uniq %d, too much!",
+ pr_warn("downcall opc %d, uniq %d, too much!",
hdr.opcode, hdr.unique);
nbytes = size;
}
@@ -400,7 +400,7 @@ static int __init init_coda(void)
status = register_filesystem(&coda_fs_type);
if (status) {
- pr_warn("coda: failed to register filesystem!\n");
+ pr_warn("failed to register filesystem!\n");
goto out;
}
return 0;
@@ -422,7 +422,7 @@ static void __exit exit_coda(void)
err = unregister_filesystem(&coda_fs_type);
if (err != 0)
- pr_warn("coda: failed to unregister filesystem\n");
+ pr_warn("failed to unregister filesystem\n");
for (i = 0; i < MAX_CODADEVS; i++)
device_destroy(coda_psdev_class, MKDEV(CODA_PSDEV_MAJOR, i));
class_destroy(coda_psdev_class);
diff --git a/fs/coda/upcall.c b/fs/coda/upcall.c
index 5f3b21714c59..0780de514bf2 100644
--- a/fs/coda/upcall.c
+++ b/fs/coda/upcall.c
@@ -675,7 +675,7 @@ static int coda_upcall(struct venus_comm *vcp,
mutex_lock(&vcp->vc_mutex);
if (!vcp->vc_inuse) {
- pr_notice("coda: Venus dead, not sending upcall\n");
+ pr_notice("Venus dead, not sending upcall\n");
error = -ENXIO;
goto exit;
}
@@ -725,7 +725,7 @@ static int coda_upcall(struct venus_comm *vcp,
error = -EINTR;
if ((req->uc_flags & CODA_REQ_ABORT) || !signal_pending(current)) {
- pr_warn("coda: Unexpected interruption.\n");
+ pr_warn("Unexpected interruption.\n");
goto exit;
}
@@ -735,7 +735,7 @@ static int coda_upcall(struct venus_comm *vcp,
/* Venus saw the upcall, make sure we can send interrupt signal */
if (!vcp->vc_inuse) {
- pr_info("coda: Venus dead, not sending signal.\n");
+ pr_info("Venus dead, not sending signal.\n");
goto exit;
}