Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Fabian Frederick and committed by
Linus Torvalds
f38cfb25 d9b4b319

+14 -8
+6
fs/coda/coda_linux.h
··· 12 12 #ifndef _LINUX_CODA_FS 13 13 #define _LINUX_CODA_FS 14 14 15 + #ifdef pr_fmt 16 + #undef pr_fmt 17 + #endif 18 + 19 + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt 20 + 15 21 #include <linux/kernel.h> 16 22 #include <linux/param.h> 17 23 #include <linux/mm.h>
+1 -1
fs/coda/dir.c
··· 589 589 coda_vattr_to_iattr(inode, &attr); 590 590 591 591 if ((old_mode & S_IFMT) != (inode->i_mode & S_IFMT)) { 592 - pr_warn("Coda: inode %ld, fid %s changed type!\n", 592 + pr_warn("inode %ld, fid %s changed type!\n", 593 593 inode->i_ino, coda_f2s(&(cii->c_fid))); 594 594 } 595 595
+1 -1
fs/coda/inode.c
··· 247 247 sb->s_fs_info = NULL; 248 248 mutex_unlock(&vcp->vc_mutex); 249 249 250 - pr_info("Coda: Bye bye.\n"); 250 + pr_info("Bye bye.\n"); 251 251 } 252 252 253 253 static void coda_evict_inode(struct inode *inode)
+3 -3
fs/coda/psdev.c
··· 120 120 goto out; 121 121 } 122 122 if ( nbytes > size ) { 123 - pr_warn("Coda: downcall opc %d, uniq %d, too much!", 123 + pr_warn("downcall opc %d, uniq %d, too much!", 124 124 hdr.opcode, hdr.unique); 125 125 nbytes = size; 126 126 } ··· 400 400 401 401 status = register_filesystem(&coda_fs_type); 402 402 if (status) { 403 - pr_warn("coda: failed to register filesystem!\n"); 403 + pr_warn("failed to register filesystem!\n"); 404 404 goto out; 405 405 } 406 406 return 0; ··· 422 422 423 423 err = unregister_filesystem(&coda_fs_type); 424 424 if (err != 0) 425 - pr_warn("coda: failed to unregister filesystem\n"); 425 + pr_warn("failed to unregister filesystem\n"); 426 426 for (i = 0; i < MAX_CODADEVS; i++) 427 427 device_destroy(coda_psdev_class, MKDEV(CODA_PSDEV_MAJOR, i)); 428 428 class_destroy(coda_psdev_class);
+3 -3
fs/coda/upcall.c
··· 675 675 mutex_lock(&vcp->vc_mutex); 676 676 677 677 if (!vcp->vc_inuse) { 678 - pr_notice("coda: Venus dead, not sending upcall\n"); 678 + pr_notice("Venus dead, not sending upcall\n"); 679 679 error = -ENXIO; 680 680 goto exit; 681 681 } ··· 725 725 726 726 error = -EINTR; 727 727 if ((req->uc_flags & CODA_REQ_ABORT) || !signal_pending(current)) { 728 - pr_warn("coda: Unexpected interruption.\n"); 728 + pr_warn("Unexpected interruption.\n"); 729 729 goto exit; 730 730 } 731 731 ··· 735 735 736 736 /* Venus saw the upcall, make sure we can send interrupt signal */ 737 737 if (!vcp->vc_inuse) { 738 - pr_info("coda: Venus dead, not sending signal.\n"); 738 + pr_info("Venus dead, not sending signal.\n"); 739 739 goto exit; 740 740 } 741 741