aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/objlayout
diff options
context:
space:
mode:
authorWeston Andros Adamson <dros@netapp.com>2012-01-26 13:32:23 -0500
committerTrond Myklebust <Trond.Myklebust@netapp.com>2012-02-06 18:48:00 -0500
commita030889a01d1bea921e1a7501010b7b891d2abd2 (patch)
tree4e76ec42bbdd41682e6cea5541f305c2f1275e99 /fs/nfs/objlayout
parentf9fd2d9c1f3b512c9794abbbd76c77a6e6de57aa (diff)
NFS: start printks w/ NFS: even if __func__ shown
This patch addresses printks that have some context to show that they are from fs/nfs/, but for the sake of consistency now start with NFS: Signed-off-by: Weston Andros Adamson <dros@netapp.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/objlayout')
-rw-r--r--fs/nfs/objlayout/objio_osd.c6
-rw-r--r--fs/nfs/objlayout/objlayout.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/fs/nfs/objlayout/objio_osd.c b/fs/nfs/objlayout/objio_osd.c
index 55d01280a609..405a62bdb9b4 100644
--- a/fs/nfs/objlayout/objio_osd.c
+++ b/fs/nfs/objlayout/objio_osd.c
@@ -582,10 +582,10 @@ objlayout_init(void)
582 582
583 if (ret) 583 if (ret)
584 printk(KERN_INFO 584 printk(KERN_INFO
585 "%s: Registering OSD pNFS Layout Driver failed: error=%d\n", 585 "NFS: %s: Registering OSD pNFS Layout Driver failed: error=%d\n",
586 __func__, ret); 586 __func__, ret);
587 else 587 else
588 printk(KERN_INFO "%s: Registered OSD pNFS Layout Driver\n", 588 printk(KERN_INFO "NFS: %s: Registered OSD pNFS Layout Driver\n",
589 __func__); 589 __func__);
590 return ret; 590 return ret;
591} 591}
@@ -594,7 +594,7 @@ static void __exit
594objlayout_exit(void) 594objlayout_exit(void)
595{ 595{
596 pnfs_unregister_layoutdriver(&objlayout_type); 596 pnfs_unregister_layoutdriver(&objlayout_type);
597 printk(KERN_INFO "%s: Unregistered OSD pNFS Layout Driver\n", 597 printk(KERN_INFO "NFS: %s: Unregistered OSD pNFS Layout Driver\n",
598 __func__); 598 __func__);
599} 599}
600 600
diff --git a/fs/nfs/objlayout/objlayout.c b/fs/nfs/objlayout/objlayout.c
index b3c29039f5b8..2bd185277adb 100644
--- a/fs/nfs/objlayout/objlayout.c
+++ b/fs/nfs/objlayout/objlayout.c
@@ -490,9 +490,9 @@ encode_accumulated_error(struct objlayout *objlay, __be32 *p)
490 if (!ioerr->oer_errno) 490 if (!ioerr->oer_errno)
491 continue; 491 continue;
492 492
493 printk(KERN_ERR "%s: err[%d]: errno=%d is_write=%d " 493 printk(KERN_ERR "NFS: %s: err[%d]: errno=%d "
494 "dev(%llx:%llx) par=0x%llx obj=0x%llx " 494 "is_write=%d dev(%llx:%llx) par=0x%llx "
495 "offset=0x%llx length=0x%llx\n", 495 "obj=0x%llx offset=0x%llx length=0x%llx\n",
496 __func__, i, ioerr->oer_errno, 496 __func__, i, ioerr->oer_errno,
497 ioerr->oer_iswrite, 497 ioerr->oer_iswrite,
498 _DEVID_LO(&ioerr->oer_component.oid_device_id), 498 _DEVID_LO(&ioerr->oer_component.oid_device_id),