aboutsummaryrefslogtreecommitdiffstats
path: root/fs/coda/upcall.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/coda/upcall.c')
-rw-r--r--fs/coda/upcall.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/fs/coda/upcall.c b/fs/coda/upcall.c
index 3a731976dc5e..5f3b21714c59 100644
--- a/fs/coda/upcall.c
+++ b/fs/coda/upcall.c
@@ -508,8 +508,8 @@ int venus_pioctl(struct super_block *sb, struct CodaFid *fid,
508 inp->coda_ioctl.data = (char *)(INSIZE(ioctl)); 508 inp->coda_ioctl.data = (char *)(INSIZE(ioctl));
509 509
510 /* get the data out of user space */ 510 /* get the data out of user space */
511 if ( copy_from_user((char*)inp + (long)inp->coda_ioctl.data, 511 if (copy_from_user((char *)inp + (long)inp->coda_ioctl.data,
512 data->vi.in, data->vi.in_size) ) { 512 data->vi.in, data->vi.in_size)) {
513 error = -EINVAL; 513 error = -EINVAL;
514 goto exit; 514 goto exit;
515 } 515 }
@@ -518,8 +518,8 @@ int venus_pioctl(struct super_block *sb, struct CodaFid *fid,
518 &outsize, inp); 518 &outsize, inp);
519 519
520 if (error) { 520 if (error) {
521 printk("coda_pioctl: Venus returns: %d for %s\n", 521 pr_warn("coda_pioctl: Venus returns: %d for %s\n",
522 error, coda_f2s(fid)); 522 error, coda_f2s(fid));
523 goto exit; 523 goto exit;
524 } 524 }
525 525
@@ -675,7 +675,7 @@ static int coda_upcall(struct venus_comm *vcp,
675 mutex_lock(&vcp->vc_mutex); 675 mutex_lock(&vcp->vc_mutex);
676 676
677 if (!vcp->vc_inuse) { 677 if (!vcp->vc_inuse) {
678 printk(KERN_NOTICE "coda: Venus dead, not sending upcall\n"); 678 pr_notice("coda: Venus dead, not sending upcall\n");
679 error = -ENXIO; 679 error = -ENXIO;
680 goto exit; 680 goto exit;
681 } 681 }
@@ -725,7 +725,7 @@ static int coda_upcall(struct venus_comm *vcp,
725 725
726 error = -EINTR; 726 error = -EINTR;
727 if ((req->uc_flags & CODA_REQ_ABORT) || !signal_pending(current)) { 727 if ((req->uc_flags & CODA_REQ_ABORT) || !signal_pending(current)) {
728 printk(KERN_WARNING "coda: Unexpected interruption.\n"); 728 pr_warn("coda: Unexpected interruption.\n");
729 goto exit; 729 goto exit;
730 } 730 }
731 731
@@ -735,7 +735,7 @@ static int coda_upcall(struct venus_comm *vcp,
735 735
736 /* Venus saw the upcall, make sure we can send interrupt signal */ 736 /* Venus saw the upcall, make sure we can send interrupt signal */
737 if (!vcp->vc_inuse) { 737 if (!vcp->vc_inuse) {
738 printk(KERN_INFO "coda: Venus dead, not sending signal.\n"); 738 pr_info("coda: Venus dead, not sending signal.\n");
739 goto exit; 739 goto exit;
740 } 740 }
741 741