diff options
author | Weston Andros Adamson <dros@netapp.com> | 2012-01-26 13:32:23 -0500 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-02-06 18:48:00 -0500 |
commit | a030889a01d1bea921e1a7501010b7b891d2abd2 (patch) | |
tree | 4e76ec42bbdd41682e6cea5541f305c2f1275e99 /fs/nfs | |
parent | f9fd2d9c1f3b512c9794abbbd76c77a6e6de57aa (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')
-rw-r--r-- | fs/nfs/blocklayout/blocklayoutdev.c | 2 | ||||
-rw-r--r-- | fs/nfs/blocklayout/blocklayoutdm.c | 2 | ||||
-rw-r--r-- | fs/nfs/callback.c | 2 | ||||
-rw-r--r-- | fs/nfs/callback_xdr.c | 6 | ||||
-rw-r--r-- | fs/nfs/idmap.c | 6 | ||||
-rw-r--r-- | fs/nfs/inode.c | 2 | ||||
-rw-r--r-- | fs/nfs/nfs4filelayout.c | 6 | ||||
-rw-r--r-- | fs/nfs/nfs4filelayoutdev.c | 10 | ||||
-rw-r--r-- | fs/nfs/nfs4proc.c | 7 | ||||
-rw-r--r-- | fs/nfs/nfs4state.c | 12 | ||||
-rw-r--r-- | fs/nfs/nfs4xdr.c | 10 | ||||
-rw-r--r-- | fs/nfs/objlayout/objio_osd.c | 6 | ||||
-rw-r--r-- | fs/nfs/objlayout/objlayout.c | 6 | ||||
-rw-r--r-- | fs/nfs/pnfs.c | 14 |
14 files changed, 48 insertions, 43 deletions
diff --git a/fs/nfs/blocklayout/blocklayoutdev.c b/fs/nfs/blocklayout/blocklayoutdev.c index 94ed978860c0..b48f782a94ad 100644 --- a/fs/nfs/blocklayout/blocklayoutdev.c +++ b/fs/nfs/blocklayout/blocklayoutdev.c | |||
@@ -46,7 +46,7 @@ static int decode_sector_number(__be32 **rp, sector_t *sp) | |||
46 | 46 | ||
47 | *rp = xdr_decode_hyper(*rp, &s); | 47 | *rp = xdr_decode_hyper(*rp, &s); |
48 | if (s & 0x1ff) { | 48 | if (s & 0x1ff) { |
49 | printk(KERN_WARNING "%s: sector not aligned\n", __func__); | 49 | printk(KERN_WARNING "NFS: %s: sector not aligned\n", __func__); |
50 | return -1; | 50 | return -1; |
51 | } | 51 | } |
52 | *sp = s >> SECTOR_SHIFT; | 52 | *sp = s >> SECTOR_SHIFT; |
diff --git a/fs/nfs/blocklayout/blocklayoutdm.c b/fs/nfs/blocklayout/blocklayoutdm.c index 970490f556de..a0f588fa49c1 100644 --- a/fs/nfs/blocklayout/blocklayoutdm.c +++ b/fs/nfs/blocklayout/blocklayoutdm.c | |||
@@ -91,7 +91,7 @@ static void nfs4_blk_metadev_release(struct pnfs_block_dev *bdev) | |||
91 | dprintk("%s Releasing\n", __func__); | 91 | dprintk("%s Releasing\n", __func__); |
92 | rv = nfs4_blkdev_put(bdev->bm_mdev); | 92 | rv = nfs4_blkdev_put(bdev->bm_mdev); |
93 | if (rv) | 93 | if (rv) |
94 | printk(KERN_ERR "%s nfs4_blkdev_put returns %d\n", | 94 | printk(KERN_ERR "NFS: %s nfs4_blkdev_put returns %d\n", |
95 | __func__, rv); | 95 | __func__, rv); |
96 | 96 | ||
97 | dev_remove(bdev->net, bdev->bm_mdev->bd_dev); | 97 | dev_remove(bdev->net, bdev->bm_mdev->bd_dev); |
diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c index d81040a7efc4..4a122ae71762 100644 --- a/fs/nfs/callback.c +++ b/fs/nfs/callback.c | |||
@@ -85,7 +85,7 @@ nfs4_callback_svc(void *vrqstp) | |||
85 | } | 85 | } |
86 | if (err < 0) { | 86 | if (err < 0) { |
87 | if (err != preverr) { | 87 | if (err != preverr) { |
88 | printk(KERN_WARNING "%s: unexpected error " | 88 | printk(KERN_WARNING "NFS: %s: unexpected error " |
89 | "from svc_recv (%d)\n", __func__, err); | 89 | "from svc_recv (%d)\n", __func__, err); |
90 | preverr = err; | 90 | preverr = err; |
91 | } | 91 | } |
diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c index d50b2742f23b..2f45aa717423 100644 --- a/fs/nfs/callback_xdr.c +++ b/fs/nfs/callback_xdr.c | |||
@@ -73,7 +73,7 @@ static __be32 *read_buf(struct xdr_stream *xdr, int nbytes) | |||
73 | 73 | ||
74 | p = xdr_inline_decode(xdr, nbytes); | 74 | p = xdr_inline_decode(xdr, nbytes); |
75 | if (unlikely(p == NULL)) | 75 | if (unlikely(p == NULL)) |
76 | printk(KERN_WARNING "NFSv4 callback reply buffer overflowed!\n"); | 76 | printk(KERN_WARNING "NFS: NFSv4 callback reply buffer overflowed!\n"); |
77 | return p; | 77 | return p; |
78 | } | 78 | } |
79 | 79 | ||
@@ -155,7 +155,7 @@ static __be32 decode_compound_hdr_arg(struct xdr_stream *xdr, struct cb_compound | |||
155 | return status; | 155 | return status; |
156 | /* We do not like overly long tags! */ | 156 | /* We do not like overly long tags! */ |
157 | if (hdr->taglen > CB_OP_TAGLEN_MAXSZ - 12) { | 157 | if (hdr->taglen > CB_OP_TAGLEN_MAXSZ - 12) { |
158 | printk("NFSv4 CALLBACK %s: client sent tag of length %u\n", | 158 | printk("NFS: NFSv4 CALLBACK %s: client sent tag of length %u\n", |
159 | __func__, hdr->taglen); | 159 | __func__, hdr->taglen); |
160 | return htonl(NFS4ERR_RESOURCE); | 160 | return htonl(NFS4ERR_RESOURCE); |
161 | } | 161 | } |
@@ -167,7 +167,7 @@ static __be32 decode_compound_hdr_arg(struct xdr_stream *xdr, struct cb_compound | |||
167 | if (hdr->minorversion <= 1) { | 167 | if (hdr->minorversion <= 1) { |
168 | hdr->cb_ident = ntohl(*p++); /* ignored by v4.1 */ | 168 | hdr->cb_ident = ntohl(*p++); /* ignored by v4.1 */ |
169 | } else { | 169 | } else { |
170 | printk(KERN_WARNING "%s: NFSv4 server callback with " | 170 | printk(KERN_WARNING "NFS: %s: NFSv4 server callback with " |
171 | "illegal minor version %u!\n", | 171 | "illegal minor version %u!\n", |
172 | __func__, hdr->minorversion); | 172 | __func__, hdr->minorversion); |
173 | return htonl(NFS4ERR_MINOR_VERS_MISMATCH); | 173 | return htonl(NFS4ERR_MINOR_VERS_MISMATCH); |
diff --git a/fs/nfs/idmap.c b/fs/nfs/idmap.c index 91b1e2a82146..62264e0b1ddb 100644 --- a/fs/nfs/idmap.c +++ b/fs/nfs/idmap.c | |||
@@ -558,11 +558,13 @@ static int __rpc_pipefs_event(struct nfs_client *clp, unsigned long event, | |||
558 | * here. | 558 | * here. |
559 | */ | 559 | */ |
560 | if (rpc_rmdir(parent)) | 560 | if (rpc_rmdir(parent)) |
561 | printk(KERN_ERR "%s: failed to remove clnt dir!\n", __func__); | 561 | printk(KERN_ERR "NFS: %s: failed to remove " |
562 | "clnt dir!\n", __func__); | ||
562 | } | 563 | } |
563 | break; | 564 | break; |
564 | default: | 565 | default: |
565 | printk(KERN_ERR "%s: unknown event: %ld\n", __func__, event); | 566 | printk(KERN_ERR "NFS: %s: unknown event: %ld\n", __func__, |
567 | event); | ||
566 | return -ENOTSUPP; | 568 | return -ENOTSUPP; |
567 | } | 569 | } |
568 | return err; | 570 | return err; |
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index d2c760e193f4..028464bcbe0e 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c | |||
@@ -1407,7 +1407,7 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr) | |||
1407 | /* | 1407 | /* |
1408 | * Big trouble! The inode has become a different object. | 1408 | * Big trouble! The inode has become a different object. |
1409 | */ | 1409 | */ |
1410 | printk(KERN_DEBUG "%s: inode %ld mode changed, %07o to %07o\n", | 1410 | printk(KERN_DEBUG "NFS: %s: inode %ld mode changed, %07o to %07o\n", |
1411 | __func__, inode->i_ino, inode->i_mode, fattr->mode); | 1411 | __func__, inode->i_ino, inode->i_mode, fattr->mode); |
1412 | out_err: | 1412 | out_err: |
1413 | /* | 1413 | /* |
diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/nfs4filelayout.c index 9a058b8c2888..79be7acc9bae 100644 --- a/fs/nfs/nfs4filelayout.c +++ b/fs/nfs/nfs4filelayout.c | |||
@@ -367,7 +367,8 @@ filelayout_write_pagelist(struct nfs_write_data *data, int sync) | |||
367 | idx = nfs4_fl_calc_ds_index(lseg, j); | 367 | idx = nfs4_fl_calc_ds_index(lseg, j); |
368 | ds = nfs4_fl_prepare_ds(lseg, idx); | 368 | ds = nfs4_fl_prepare_ds(lseg, idx); |
369 | if (!ds) { | 369 | if (!ds) { |
370 | printk(KERN_ERR "%s: prepare_ds failed, use MDS\n", __func__); | 370 | printk(KERN_ERR "NFS: %s: prepare_ds failed, use MDS\n", |
371 | __func__); | ||
371 | set_bit(lo_fail_bit(IOMODE_RW), &lseg->pls_layout->plh_flags); | 372 | set_bit(lo_fail_bit(IOMODE_RW), &lseg->pls_layout->plh_flags); |
372 | set_bit(lo_fail_bit(IOMODE_READ), &lseg->pls_layout->plh_flags); | 373 | set_bit(lo_fail_bit(IOMODE_READ), &lseg->pls_layout->plh_flags); |
373 | return PNFS_NOT_ATTEMPTED; | 374 | return PNFS_NOT_ATTEMPTED; |
@@ -797,7 +798,8 @@ static int filelayout_initiate_commit(struct nfs_write_data *data, int how) | |||
797 | idx = calc_ds_index_from_commit(lseg, data->ds_commit_index); | 798 | idx = calc_ds_index_from_commit(lseg, data->ds_commit_index); |
798 | ds = nfs4_fl_prepare_ds(lseg, idx); | 799 | ds = nfs4_fl_prepare_ds(lseg, idx); |
799 | if (!ds) { | 800 | if (!ds) { |
800 | printk(KERN_ERR "%s: prepare_ds failed, use MDS\n", __func__); | 801 | printk(KERN_ERR "NFS: %s: prepare_ds failed, use MDS\n", |
802 | __func__); | ||
801 | set_bit(lo_fail_bit(IOMODE_RW), &lseg->pls_layout->plh_flags); | 803 | set_bit(lo_fail_bit(IOMODE_RW), &lseg->pls_layout->plh_flags); |
802 | set_bit(lo_fail_bit(IOMODE_READ), &lseg->pls_layout->plh_flags); | 804 | set_bit(lo_fail_bit(IOMODE_READ), &lseg->pls_layout->plh_flags); |
803 | prepare_to_resend_writes(data); | 805 | prepare_to_resend_writes(data); |
diff --git a/fs/nfs/nfs4filelayoutdev.c b/fs/nfs/nfs4filelayoutdev.c index 6eb59b044bfc..80fce8dade2e 100644 --- a/fs/nfs/nfs4filelayoutdev.c +++ b/fs/nfs/nfs4filelayoutdev.c | |||
@@ -554,7 +554,7 @@ decode_device(struct inode *ino, struct pnfs_device *pdev, gfp_t gfp_flags) | |||
554 | cnt = be32_to_cpup(p); | 554 | cnt = be32_to_cpup(p); |
555 | dprintk("%s stripe count %d\n", __func__, cnt); | 555 | dprintk("%s stripe count %d\n", __func__, cnt); |
556 | if (cnt > NFS4_PNFS_MAX_STRIPE_CNT) { | 556 | if (cnt > NFS4_PNFS_MAX_STRIPE_CNT) { |
557 | printk(KERN_WARNING "%s: stripe count %d greater than " | 557 | printk(KERN_WARNING "NFS: %s: stripe count %d greater than " |
558 | "supported maximum %d\n", __func__, | 558 | "supported maximum %d\n", __func__, |
559 | cnt, NFS4_PNFS_MAX_STRIPE_CNT); | 559 | cnt, NFS4_PNFS_MAX_STRIPE_CNT); |
560 | goto out_err_free_scratch; | 560 | goto out_err_free_scratch; |
@@ -585,7 +585,7 @@ decode_device(struct inode *ino, struct pnfs_device *pdev, gfp_t gfp_flags) | |||
585 | num = be32_to_cpup(p); | 585 | num = be32_to_cpup(p); |
586 | dprintk("%s ds_num %u\n", __func__, num); | 586 | dprintk("%s ds_num %u\n", __func__, num); |
587 | if (num > NFS4_PNFS_MAX_MULTI_CNT) { | 587 | if (num > NFS4_PNFS_MAX_MULTI_CNT) { |
588 | printk(KERN_WARNING "%s: multipath count %d greater than " | 588 | printk(KERN_WARNING "NFS: %s: multipath count %d greater than " |
589 | "supported maximum %d\n", __func__, | 589 | "supported maximum %d\n", __func__, |
590 | num, NFS4_PNFS_MAX_MULTI_CNT); | 590 | num, NFS4_PNFS_MAX_MULTI_CNT); |
591 | goto out_err_free_stripe_indices; | 591 | goto out_err_free_stripe_indices; |
@@ -593,7 +593,7 @@ decode_device(struct inode *ino, struct pnfs_device *pdev, gfp_t gfp_flags) | |||
593 | 593 | ||
594 | /* validate stripe indices are all < num */ | 594 | /* validate stripe indices are all < num */ |
595 | if (max_stripe_index >= num) { | 595 | if (max_stripe_index >= num) { |
596 | printk(KERN_WARNING "%s: stripe index %u >= num ds %u\n", | 596 | printk(KERN_WARNING "NFS: %s: stripe index %u >= num ds %u\n", |
597 | __func__, max_stripe_index, num); | 597 | __func__, max_stripe_index, num); |
598 | goto out_err_free_stripe_indices; | 598 | goto out_err_free_stripe_indices; |
599 | } | 599 | } |
@@ -687,7 +687,7 @@ decode_and_add_device(struct inode *inode, struct pnfs_device *dev, gfp_t gfp_fl | |||
687 | 687 | ||
688 | new = decode_device(inode, dev, gfp_flags); | 688 | new = decode_device(inode, dev, gfp_flags); |
689 | if (!new) { | 689 | if (!new) { |
690 | printk(KERN_WARNING "%s: Could not decode or add device\n", | 690 | printk(KERN_WARNING "NFS: %s: Could not decode or add device\n", |
691 | __func__); | 691 | __func__); |
692 | return NULL; | 692 | return NULL; |
693 | } | 693 | } |
@@ -836,7 +836,7 @@ nfs4_fl_prepare_ds(struct pnfs_layout_segment *lseg, u32 ds_idx) | |||
836 | struct nfs4_pnfs_ds *ds = dsaddr->ds_list[ds_idx]; | 836 | struct nfs4_pnfs_ds *ds = dsaddr->ds_list[ds_idx]; |
837 | 837 | ||
838 | if (ds == NULL) { | 838 | if (ds == NULL) { |
839 | printk(KERN_ERR "%s: No data server for offset index %d\n", | 839 | printk(KERN_ERR "NFS: %s: No data server for offset index %d\n", |
840 | __func__, ds_idx); | 840 | __func__, ds_idx); |
841 | return NULL; | 841 | return NULL; |
842 | } | 842 | } |
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 34e525549f85..482ed97189c9 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c | |||
@@ -4584,7 +4584,8 @@ static int _nfs4_proc_setlk(struct nfs4_state *state, int cmd, struct file_lock | |||
4584 | /* Note: we always want to sleep here! */ | 4584 | /* Note: we always want to sleep here! */ |
4585 | request->fl_flags = fl_flags | FL_SLEEP; | 4585 | request->fl_flags = fl_flags | FL_SLEEP; |
4586 | if (do_vfs_lock(request->fl_file, request) < 0) | 4586 | if (do_vfs_lock(request->fl_file, request) < 0) |
4587 | printk(KERN_WARNING "%s: VFS is out of sync with lock manager!\n", __func__); | 4587 | printk(KERN_WARNING "NFS: %s: VFS is out of sync with lock " |
4588 | "manager!\n", __func__); | ||
4588 | out_unlock: | 4589 | out_unlock: |
4589 | up_read(&nfsi->rwsem); | 4590 | up_read(&nfsi->rwsem); |
4590 | out: | 4591 | out: |
@@ -4664,8 +4665,8 @@ int nfs4_lock_delegation_recall(struct nfs4_state *state, struct file_lock *fl) | |||
4664 | err = _nfs4_do_setlk(state, F_SETLK, fl, NFS_LOCK_NEW); | 4665 | err = _nfs4_do_setlk(state, F_SETLK, fl, NFS_LOCK_NEW); |
4665 | switch (err) { | 4666 | switch (err) { |
4666 | default: | 4667 | default: |
4667 | printk(KERN_ERR "%s: unhandled error %d.\n", | 4668 | printk(KERN_ERR "NFS: %s: unhandled error " |
4668 | __func__, err); | 4669 | "%d.\n", __func__, err); |
4669 | case 0: | 4670 | case 0: |
4670 | case -ESTALE: | 4671 | case -ESTALE: |
4671 | goto out; | 4672 | goto out; |
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c index b43a65d7faca..4e37818a34ef 100644 --- a/fs/nfs/nfs4state.c +++ b/fs/nfs/nfs4state.c | |||
@@ -1138,8 +1138,8 @@ static int nfs4_reclaim_locks(struct nfs4_state *state, const struct nfs4_state_ | |||
1138 | case -NFS4ERR_CONN_NOT_BOUND_TO_SESSION: | 1138 | case -NFS4ERR_CONN_NOT_BOUND_TO_SESSION: |
1139 | goto out; | 1139 | goto out; |
1140 | default: | 1140 | default: |
1141 | printk(KERN_ERR "%s: unhandled error %d. Zeroing state\n", | 1141 | printk(KERN_ERR "NFS: %s: unhandled error %d. " |
1142 | __func__, status); | 1142 | "Zeroing state\n", __func__, status); |
1143 | case -ENOMEM: | 1143 | case -ENOMEM: |
1144 | case -NFS4ERR_DENIED: | 1144 | case -NFS4ERR_DENIED: |
1145 | case -NFS4ERR_RECLAIM_BAD: | 1145 | case -NFS4ERR_RECLAIM_BAD: |
@@ -1185,8 +1185,8 @@ restart: | |||
1185 | spin_lock(&state->state_lock); | 1185 | spin_lock(&state->state_lock); |
1186 | list_for_each_entry(lock, &state->lock_states, ls_locks) { | 1186 | list_for_each_entry(lock, &state->lock_states, ls_locks) { |
1187 | if (!(lock->ls_flags & NFS_LOCK_INITIALIZED)) | 1187 | if (!(lock->ls_flags & NFS_LOCK_INITIALIZED)) |
1188 | printk("%s: Lock reclaim failed!\n", | 1188 | printk("NFS: %s: Lock reclaim " |
1189 | __func__); | 1189 | "failed!\n", __func__); |
1190 | } | 1190 | } |
1191 | spin_unlock(&state->state_lock); | 1191 | spin_unlock(&state->state_lock); |
1192 | nfs4_put_open_state(state); | 1192 | nfs4_put_open_state(state); |
@@ -1195,8 +1195,8 @@ restart: | |||
1195 | } | 1195 | } |
1196 | switch (status) { | 1196 | switch (status) { |
1197 | default: | 1197 | default: |
1198 | printk(KERN_ERR "%s: unhandled error %d. Zeroing state\n", | 1198 | printk(KERN_ERR "NFS: %s: unhandled error %d. " |
1199 | __func__, status); | 1199 | "Zeroing state\n", __func__, status); |
1200 | case -ENOENT: | 1200 | case -ENOENT: |
1201 | case -ENOMEM: | 1201 | case -ENOMEM: |
1202 | case -ESTALE: | 1202 | case -ESTALE: |
diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c index 2adcc979e5df..ae7834366712 100644 --- a/fs/nfs/nfs4xdr.c +++ b/fs/nfs/nfs4xdr.c | |||
@@ -4468,8 +4468,8 @@ static int decode_first_pnfs_layout_type(struct xdr_stream *xdr, | |||
4468 | return 0; | 4468 | return 0; |
4469 | } | 4469 | } |
4470 | if (num > 1) | 4470 | if (num > 1) |
4471 | printk(KERN_INFO "%s: Warning: Multiple pNFS layout drivers " | 4471 | printk(KERN_INFO "NFS: %s: Warning: Multiple pNFS layout " |
4472 | "per filesystem not supported\n", __func__); | 4472 | "drivers per filesystem not supported\n", __func__); |
4473 | 4473 | ||
4474 | /* Decode and set first layout type, move xdr->p past unused types */ | 4474 | /* Decode and set first layout type, move xdr->p past unused types */ |
4475 | p = xdr_inline_decode(xdr, num * 4); | 4475 | p = xdr_inline_decode(xdr, num * 4); |
@@ -5290,8 +5290,8 @@ static int decode_chan_attrs(struct xdr_stream *xdr, | |||
5290 | attrs->max_reqs = be32_to_cpup(p++); | 5290 | attrs->max_reqs = be32_to_cpup(p++); |
5291 | nr_attrs = be32_to_cpup(p); | 5291 | nr_attrs = be32_to_cpup(p); |
5292 | if (unlikely(nr_attrs > 1)) { | 5292 | if (unlikely(nr_attrs > 1)) { |
5293 | printk(KERN_WARNING "%s: Invalid rdma channel attrs count %u\n", | 5293 | printk(KERN_WARNING "NFS: %s: Invalid rdma channel attrs " |
5294 | __func__, nr_attrs); | 5294 | "count %u\n", __func__, nr_attrs); |
5295 | return -EINVAL; | 5295 | return -EINVAL; |
5296 | } | 5296 | } |
5297 | if (nr_attrs == 1) { | 5297 | if (nr_attrs == 1) { |
@@ -5448,7 +5448,7 @@ static int decode_getdevicelist(struct xdr_stream *xdr, | |||
5448 | dprintk("%s: num_dev %d\n", __func__, res->num_devs); | 5448 | dprintk("%s: num_dev %d\n", __func__, res->num_devs); |
5449 | 5449 | ||
5450 | if (res->num_devs > NFS4_PNFS_GETDEVLIST_MAXNUM) { | 5450 | if (res->num_devs > NFS4_PNFS_GETDEVLIST_MAXNUM) { |
5451 | printk(KERN_ERR "%s too many result dev_num %u\n", | 5451 | printk(KERN_ERR "NFS: %s too many result dev_num %u\n", |
5452 | __func__, res->num_devs); | 5452 | __func__, res->num_devs); |
5453 | return -EIO; | 5453 | return -EIO; |
5454 | } | 5454 | } |
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 | |||
594 | objlayout_exit(void) | 594 | objlayout_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), |
diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index 92927878c2f8..a53421604bc4 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c | |||
@@ -101,8 +101,8 @@ set_pnfs_layoutdriver(struct nfs_server *server, const struct nfs_fh *mntfh, | |||
101 | goto out_no_driver; | 101 | goto out_no_driver; |
102 | if (!(server->nfs_client->cl_exchange_flags & | 102 | if (!(server->nfs_client->cl_exchange_flags & |
103 | (EXCHGID4_FLAG_USE_NON_PNFS | EXCHGID4_FLAG_USE_PNFS_MDS))) { | 103 | (EXCHGID4_FLAG_USE_NON_PNFS | EXCHGID4_FLAG_USE_PNFS_MDS))) { |
104 | printk(KERN_ERR "%s: id %u cl_exchange_flags 0x%x\n", __func__, | 104 | printk(KERN_ERR "NFS: %s: id %u cl_exchange_flags 0x%x\n", |
105 | id, server->nfs_client->cl_exchange_flags); | 105 | __func__, id, server->nfs_client->cl_exchange_flags); |
106 | goto out_no_driver; | 106 | goto out_no_driver; |
107 | } | 107 | } |
108 | ld_type = find_pnfs_driver(id); | 108 | ld_type = find_pnfs_driver(id); |
@@ -122,8 +122,8 @@ set_pnfs_layoutdriver(struct nfs_server *server, const struct nfs_fh *mntfh, | |||
122 | server->pnfs_curr_ld = ld_type; | 122 | server->pnfs_curr_ld = ld_type; |
123 | if (ld_type->set_layoutdriver | 123 | if (ld_type->set_layoutdriver |
124 | && ld_type->set_layoutdriver(server, mntfh)) { | 124 | && ld_type->set_layoutdriver(server, mntfh)) { |
125 | printk(KERN_ERR "%s: Error initializing pNFS layout driver %u.\n", | 125 | printk(KERN_ERR "NFS: %s: Error initializing pNFS layout " |
126 | __func__, id); | 126 | "driver %u.\n", __func__, id); |
127 | module_put(ld_type->owner); | 127 | module_put(ld_type->owner); |
128 | goto out_no_driver; | 128 | goto out_no_driver; |
129 | } | 129 | } |
@@ -143,11 +143,11 @@ pnfs_register_layoutdriver(struct pnfs_layoutdriver_type *ld_type) | |||
143 | struct pnfs_layoutdriver_type *tmp; | 143 | struct pnfs_layoutdriver_type *tmp; |
144 | 144 | ||
145 | if (ld_type->id == 0) { | 145 | if (ld_type->id == 0) { |
146 | printk(KERN_ERR "%s id 0 is reserved\n", __func__); | 146 | printk(KERN_ERR "NFS: %s id 0 is reserved\n", __func__); |
147 | return status; | 147 | return status; |
148 | } | 148 | } |
149 | if (!ld_type->alloc_lseg || !ld_type->free_lseg) { | 149 | if (!ld_type->alloc_lseg || !ld_type->free_lseg) { |
150 | printk(KERN_ERR "%s Layout driver must provide " | 150 | printk(KERN_ERR "NFS: %s Layout driver must provide " |
151 | "alloc_lseg and free_lseg.\n", __func__); | 151 | "alloc_lseg and free_lseg.\n", __func__); |
152 | return status; | 152 | return status; |
153 | } | 153 | } |
@@ -160,7 +160,7 @@ pnfs_register_layoutdriver(struct pnfs_layoutdriver_type *ld_type) | |||
160 | dprintk("%s Registering id:%u name:%s\n", __func__, ld_type->id, | 160 | dprintk("%s Registering id:%u name:%s\n", __func__, ld_type->id, |
161 | ld_type->name); | 161 | ld_type->name); |
162 | } else { | 162 | } else { |
163 | printk(KERN_ERR "%s Module with id %d already loaded!\n", | 163 | printk(KERN_ERR "NFS: %s Module with id %d already loaded!\n", |
164 | __func__, ld_type->id); | 164 | __func__, ld_type->id); |
165 | } | 165 | } |
166 | spin_unlock(&pnfs_spinlock); | 166 | spin_unlock(&pnfs_spinlock); |