From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: + knfsd-nfsd4-demote-clientid-in-use-printk-to-a-dprintk.patch added to -mm tree Date: Thu, 22 Mar 2007 23:52:56 -0800 Message-ID: <200703230752.l2N7qu88009461@shell0.pdx.osdl.net> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp.osdl.org ([65.172.181.24]:41351 "EHLO smtp.osdl.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1422696AbXCWHxB (ORCPT ); Fri, 23 Mar 2007 03:53:01 -0400 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: mm-commits@vger.kernel.org Cc: bfields@citi.umich.edu, neilb@suse.de The patch titled knfsd: nfsd4: demote "clientid in use" printk to a dprintk has been added to the -mm tree. Its filename is knfsd-nfsd4-demote-clientid-in-use-printk-to-a-dprintk.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: knfsd: nfsd4: demote "clientid in use" printk to a dprintk From: Bruce Fields The reused clientid here is a more of a problem for the client than the server, and the client can report the problem itself if it's serious. Signed-off-by: "J. Bruce Fields" Signed-off-by: Neil Brown Signed-off-by: Andrew Morton --- fs/nfsd/nfs4state.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff -puN fs/nfsd/nfs4state.c~knfsd-nfsd4-demote-clientid-in-use-printk-to-a-dprintk fs/nfsd/nfs4state.c --- a/fs/nfsd/nfs4state.c~knfsd-nfsd4-demote-clientid-in-use-printk-to-a-dprintk +++ a/fs/nfsd/nfs4state.c @@ -750,9 +750,8 @@ nfsd4_setclientid(struct svc_rqst *rqstp status = nfserr_clid_inuse; if (!cmp_creds(&conf->cl_cred, &rqstp->rq_cred) || conf->cl_addr != sin->sin_addr.s_addr) { - printk("NFSD: setclientid: string in use by client" - "(clientid %08x/%08x)\n", - conf->cl_clientid.cl_boot, conf->cl_clientid.cl_id); + dprintk("NFSD: setclientid: string in use by client" + "at %u.%u.%u.%u\n", NIPQUAD(conf->cl_addr)); goto out; } } _ Patches currently in -mm which might be from bfields@citi.umich.edu are origin.patch knfsd-nfsd4-fix-inheritance-flags-on-v4-ace-derived-from-posix-default-ace.patch knfsd-nfsd4-demote-clientid-in-use-printk-to-a-dprintk.patch knfsd-nfsd4-remove-superfluous-cancel_delayed_work-call.patch auth_gss-unregister-gss_domain-when-unloading-module.patch