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

Commit e159a08b authored by Chuck Lever's avatar Chuck Lever Committed by Trond Myklebust
Browse files

LOCKD: Convert printk's to dprintk's in lockd XDR routines 



Due to recent edict to remove or replace printk's that might flood the
system log.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent fe82a183

fs/lockd/xdr.c

+4 −4
Original line number Diff line number Diff line
@@ -62,8 +62,9 @@ static __be32 *nlm_decode_cookie(__be32 *p, struct nlm_cookie *c) 
	}

	else 

	{

		printk(KERN_NOTICE

			"lockd: bad cookie size %d (only cookies under %d bytes are supported.)\n", len, NLM_MAXCOOKIELEN);

		dprintk("lockd: bad cookie size %d (only cookies under "

			"%d bytes are supported.)\n",

				len, NLM_MAXCOOKIELEN);

		return NULL;

	}

	return p;
@@ -84,8 +85,7 @@ nlm_decode_fh(__be32 *p, struct nfs_fh *f) 
	unsigned int	len;



	if ((len = ntohl(*p++)) != NFS2_FHSIZE) {

		printk(KERN_NOTICE

			"lockd: bad fhandle size %d (should be %d)\n",

		dprintk("lockd: bad fhandle size %d (should be %d)\n",

			len, NFS2_FHSIZE);

		return NULL;

	}

fs/lockd/xdr4.c

+4 −4
Original line number Diff line number Diff line
@@ -64,8 +64,9 @@ nlm4_decode_cookie(__be32 *p, struct nlm_cookie *c) 
	}

	else 

	{

		printk(KERN_NOTICE

			"lockd: bad cookie size %d (only cookies under %d bytes are supported.)\n", len, NLM_MAXCOOKIELEN);

		dprintk("lockd: bad cookie size %d (only cookies under "

			"%d bytes are supported.)\n",

				len, NLM_MAXCOOKIELEN);

		return NULL;

	}

	return p;
@@ -86,8 +87,7 @@ nlm4_decode_fh(__be32 *p, struct nfs_fh *f) 
	memset(f->data, 0, sizeof(f->data));

	f->size = ntohl(*p++);

	if (f->size > NFS_MAXFHSIZE) {

		printk(KERN_NOTICE

			"lockd: bad fhandle size %d (should be <=%d)\n",

		dprintk("lockd: bad fhandle size %d (should be <=%d)\n",

			f->size, NFS_MAXFHSIZE);

		return NULL;

	}