patch-2.4.13 linux/fs/nfsd/nfsproc.c

• Lines: 88
• Date: Sun Oct 21 10:40:36 2001
• Orig file: v2.4.12/linux/fs/nfsd/nfsproc.c
• Orig date: Sun Sep 23 11:41:00 2001

diff -u --recursive --new-file v2.4.12/linux/fs/nfsd/nfsproc.c linux/fs/nfsd/nfsproc.c
@@ -86,8 +86,8 @@
 {
 	int	nfserr;
 
-	dprintk("nfsd: LOOKUP   %s %s\n",
-		SVCFH_fmt(&argp->fh), argp->name);
+	dprintk("nfsd: LOOKUP   %s %.*s\n",
+		SVCFH_fmt(&argp->fh), argp->len, argp->name);
 
 	fh_init(&resp->fh, NFS_FHSIZE);
 	nfserr = nfsd_lookup(rqstp, &argp->fh, argp->name, argp->len,
@@ -199,8 +199,8 @@
 	int		nfserr, type, mode;
 	dev_t		rdev = NODEV;
 
-	dprintk("nfsd: CREATE   %s %s\n",
-		SVCFH_fmt(dirfhp), argp->name);
+	dprintk("nfsd: CREATE   %s %.*s\n",
+		SVCFH_fmt(dirfhp), argp->len, argp->name);
 
 	/* First verify the parent file handle */
 	nfserr = fh_verify(rqstp, dirfhp, S_IFDIR, MAY_EXEC);
@@ -349,7 +349,8 @@
 {
 	int	nfserr;
 
-	dprintk("nfsd: REMOVE   %s %s\n", SVCFH_fmt(&argp->fh), argp->name);
+	dprintk("nfsd: REMOVE   %s %.*s\n", SVCFH_fmt(&argp->fh),
+		argp->len, argp->name);
 
 	/* Unlink. -SIFDIR means file must not be a directory */
 	nfserr = nfsd_unlink(rqstp, &argp->fh, -S_IFDIR, argp->name, argp->len);
@@ -363,10 +364,10 @@
 {
 	int	nfserr;
 
-	dprintk("nfsd: RENAME   %s %s -> \n",
-		SVCFH_fmt(&argp->ffh), argp->fname);
-	dprintk("nfsd:        ->  %s %s\n",
-		SVCFH_fmt(&argp->tfh), argp->tname);
+	dprintk("nfsd: RENAME   %s %.*s -> \n",
+		SVCFH_fmt(&argp->ffh), argp->flen, argp->fname);
+	dprintk("nfsd:        ->  %s %.*s\n",
+		SVCFH_fmt(&argp->tfh), argp->tlen, argp->tname);
 
 	nfserr = nfsd_rename(rqstp, &argp->ffh, argp->fname, argp->flen,
 				    &argp->tfh, argp->tname, argp->tlen);
@@ -383,8 +384,9 @@
 
 	dprintk("nfsd: LINK     %s ->\n",
 		SVCFH_fmt(&argp->ffh));
-	dprintk("nfsd:    %s %s\n",
+	dprintk("nfsd:    %s %.*s\n",
 		SVCFH_fmt(&argp->tfh),
+		argp->tlen,
 		argp->tname);
 
 	nfserr = nfsd_link(rqstp, &argp->tfh, argp->tname, argp->tlen,
@@ -401,8 +403,9 @@
 	struct svc_fh	newfh;
 	int		nfserr;
 
-	dprintk("nfsd: SYMLINK  %s %s -> %s\n",
-		SVCFH_fmt(&argp->ffh), argp->fname, argp->tname);
+	dprintk("nfsd: SYMLINK  %s %.*s -> %.*s\n",
+		SVCFH_fmt(&argp->ffh), argp->flen, argp->fname,
+		argp->tlen, argp->tname);
 
 	fh_init(&newfh, NFS_FHSIZE);
 	/*
@@ -428,7 +431,7 @@
 {
 	int	nfserr;
 
-	dprintk("nfsd: MKDIR    %s %s\n", SVCFH_fmt(&argp->fh), argp->name);
+	dprintk("nfsd: MKDIR    %s %.*s\n", SVCFH_fmt(&argp->fh), argp->len, argp->name);
 
 	if (resp->fh.fh_dentry) {
 		printk(KERN_WARNING
@@ -452,7 +455,7 @@
 {
 	int	nfserr;
 
-	dprintk("nfsd: RMDIR    %s %s\n", SVCFH_fmt(&argp->fh), argp->name);
+	dprintk("nfsd: RMDIR    %s %.*s\n", SVCFH_fmt(&argp->fh), argp->len, argp->name);
 
 	nfserr = nfsd_unlink(rqstp, &argp->fh, S_IFDIR, argp->name, argp->len);
 	fh_put(&argp->fh);