Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a030889a authored by Weston Andros Adamson's avatar Weston Andros Adamson Committed by Trond Myklebust
Browse files

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: default avatarWeston Andros Adamson <dros@netapp.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent f9fd2d9c

fs/nfs/blocklayout/blocklayoutdev.c

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ static int decode_sector_number(__be32 **rp, sector_t *sp) 


	*rp = xdr_decode_hyper(*rp, &s);

	if (s & 0x1ff) {

		printk(KERN_WARNING "%s: sector not aligned\n", __func__);

		printk(KERN_WARNING "NFS: %s: sector not aligned\n", __func__);

		return -1;

	}

	*sp = s >> SECTOR_SHIFT;

fs/nfs/blocklayout/blocklayoutdm.c

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ static void nfs4_blk_metadev_release(struct pnfs_block_dev *bdev) 
	dprintk("%s Releasing\n", __func__);

	rv = nfs4_blkdev_put(bdev->bm_mdev);

	if (rv)

		printk(KERN_ERR "%s nfs4_blkdev_put returns %d\n",

		printk(KERN_ERR "NFS: %s nfs4_blkdev_put returns %d\n",

				__func__, rv);



	dev_remove(bdev->net, bdev->bm_mdev->bd_dev);

fs/nfs/callback.c

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ nfs4_callback_svc(void *vrqstp) 
		}

		if (err < 0) {

			if (err != preverr) {

				printk(KERN_WARNING "%s: unexpected error "

				printk(KERN_WARNING "NFS: %s: unexpected error "

					"from svc_recv (%d)\n", __func__, err);

				preverr = err;

			}

fs/nfs/callback_xdr.c

+3 −3
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ static __be32 *read_buf(struct xdr_stream *xdr, int nbytes) 


	p = xdr_inline_decode(xdr, nbytes);

	if (unlikely(p == NULL))

		printk(KERN_WARNING "NFSv4 callback reply buffer overflowed!\n");

		printk(KERN_WARNING "NFS: NFSv4 callback reply buffer overflowed!\n");

	return p;

}
@@ -155,7 +155,7 @@ static __be32 decode_compound_hdr_arg(struct xdr_stream *xdr, struct cb_compound 
		return status;

	/* We do not like overly long tags! */

	if (hdr->taglen > CB_OP_TAGLEN_MAXSZ - 12) {

		printk("NFSv4 CALLBACK %s: client sent tag of length %u\n",

		printk("NFS: NFSv4 CALLBACK %s: client sent tag of length %u\n",

				__func__, hdr->taglen);

		return htonl(NFS4ERR_RESOURCE);

	}
@@ -167,7 +167,7 @@ static __be32 decode_compound_hdr_arg(struct xdr_stream *xdr, struct cb_compound 
	if (hdr->minorversion <= 1) {

		hdr->cb_ident = ntohl(*p++); /* ignored by v4.1 */

	} else {

		printk(KERN_WARNING "%s: NFSv4 server callback with "

		printk(KERN_WARNING "NFS: %s: NFSv4 server callback with "

			"illegal minor version %u!\n",

			__func__, hdr->minorversion);

		return htonl(NFS4ERR_MINOR_VERS_MISMATCH);

fs/nfs/idmap.c

+4 −2
Original line number Diff line number Diff line
@@ -558,11 +558,13 @@ static int __rpc_pipefs_event(struct nfs_client *clp, unsigned long event, 
			 * here.

			 */

			if (rpc_rmdir(parent))

				printk(KERN_ERR "%s: failed to remove clnt dir!\n", __func__);

				printk(KERN_ERR "NFS: %s: failed to remove "

					"clnt dir!\n", __func__);

		}

		break;

	default:

		printk(KERN_ERR "%s: unknown event: %ld\n", __func__, event);

		printk(KERN_ERR "NFS: %s: unknown event: %ld\n", __func__,

			event);

		return -ENOTSUPP;

	}

	return err;