patch-2.4.10 linux/fs/nfsd/nfs3proc.c

Next file: linux/fs/nfsd/nfs3xdr.c
Previous file: linux/fs/nfsd/lockd.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.9/linux/fs/nfsd/nfs3proc.c linux/fs/nfsd/nfs3proc.c
@@ -105,8 +105,9 @@
 {
 	int	nfserr;
 
-	dprintk("nfsd: LOOKUP(3)   %s %s\n",
+	dprintk("nfsd: LOOKUP(3)   %s %.*s\n",
 				SVCFH_fmt(&argp->fh),
+				argp->len,
 				argp->name);
 
 	fh_copy(&resp->dirfh, &argp->fh);
@@ -240,8 +241,9 @@
 	struct iattr	*attr;
 	u32		nfserr;
 
-	dprintk("nfsd: CREATE(3)   %s %s\n",
+	dprintk("nfsd: CREATE(3)   %s %.*s\n",
 				SVCFH_fmt(&argp->fh),
+				argp->len,
 				argp->name);
 
 	dirfhp = fh_copy(&resp->dirfh, &argp->fh);
@@ -279,8 +281,9 @@
 {
 	int	nfserr;
 
-	dprintk("nfsd: MKDIR(3)    %s %s\n",
+	dprintk("nfsd: MKDIR(3)    %s %.*s\n",
 				SVCFH_fmt(&argp->fh),
+				argp->len,
 				argp->name);
 
 	argp->attrs.ia_valid &= ~ATTR_SIZE;
@@ -298,9 +301,10 @@
 {
 	int	nfserr;
 
-	dprintk("nfsd: SYMLINK(3)  %s %s -> %s\n",
+	dprintk("nfsd: SYMLINK(3)  %s %.*s -> %.*s\n",
 				SVCFH_fmt(&argp->ffh),
-				argp->fname, argp->tname);
+				argp->flen, argp->fname,
+				argp->tlen, argp->tname);
 
 	fh_copy(&resp->dirfh, &argp->ffh);
 	fh_init(&resp->fh, NFS3_FHSIZE);
@@ -320,8 +324,9 @@
 	int	nfserr, type;
 	dev_t	rdev = 0;
 
-	dprintk("nfsd: MKNOD(3)    %s %s\n",
+	dprintk("nfsd: MKNOD(3)    %s %.*s\n",
 				SVCFH_fmt(&argp->fh),
+				argp->len,
 				argp->name);
 
 	fh_copy(&resp->dirfh, &argp->fh);
@@ -355,8 +360,9 @@
 {
 	int	nfserr;
 
-	dprintk("nfsd: REMOVE(3)   %s %s\n",
+	dprintk("nfsd: REMOVE(3)   %s %.*s\n",
 				SVCFH_fmt(&argp->fh),
+				argp->len,
 				argp->name);
 
 	/* Unlink. -S_IFDIR means file must not be a directory */
@@ -374,8 +380,9 @@
 {
 	int	nfserr;
 
-	dprintk("nfsd: RMDIR(3)    %s %s\n",
+	dprintk("nfsd: RMDIR(3)    %s %.*s\n",
 				SVCFH_fmt(&argp->fh),
+				argp->len,
 				argp->name);
 
 	fh_copy(&resp->fh, &argp->fh);
@@ -389,11 +396,13 @@
 {
 	int	nfserr;
 
-	dprintk("nfsd: RENAME(3)   %s %s ->\n",
+	dprintk("nfsd: RENAME(3)   %s %.*s ->\n",
 				SVCFH_fmt(&argp->ffh),
+				argp->flen,
 				argp->fname);
-	dprintk("nfsd: -> %s %s\n",
+	dprintk("nfsd: -> %s %.*s\n",
 				SVCFH_fmt(&argp->tfh),
+				argp->tlen,
 				argp->tname);
 
 	fh_copy(&resp->ffh, &argp->ffh);
@@ -411,8 +420,9 @@
 
 	dprintk("nfsd: LINK(3)     %s ->\n",
 				SVCFH_fmt(&argp->ffh));
-	dprintk("nfsd:   -> %s %s\n",
+	dprintk("nfsd:   -> %s %.*s\n",
 				SVCFH_fmt(&argp->tfh),
+				argp->tlen,
 				argp->tname);
 
 	fh_copy(&resp->fh,  &argp->ffh);

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)