patch-2.1.120 linux/fs/nfsd/nfsfh.c

• Lines: 22
• Date: Mon Aug 31 11:03:38 1998
• Orig file: v2.1.119/linux/fs/nfsd/nfsfh.c
• Orig date: Thu Aug 6 14:06:33 1998

diff -u --recursive --new-file v2.1.119/linux/fs/nfsd/nfsfh.c linux/fs/nfsd/nfsfh.c
@@ -1107,7 +1107,7 @@
 
 	dprintk("nfsd: fh_compose(exp %x/%ld %s/%s, ino=%ld)\n",
 		exp->ex_dev, exp->ex_ino,
-		dentry->d_parent->d_name.name, dentry->d_name.name,
+		parent->d_name.name, dentry->d_name.name,
 		(inode ? inode->i_ino : 0));
 
 	/*
@@ -1115,7 +1115,12 @@
 	 * may not be done on error paths, but the cleanup must call fh_put.
 	 * Fix this soon!
 	 */
+	if (fhp->fh_dverified || fhp->fh_locked || fhp->fh_dentry) {
+		printk(KERN_ERR "fh_compose: fh %s/%s not initialized!\n",
+			parent->d_name.name, dentry->d_name.name);
+	}
 	fh_init(fhp);
+
 	fhp->fh_handle.fh_dcookie = dentry;
 	if (inode) {
 		fhp->fh_handle.fh_ino = ino_t_to_u32(inode->i_ino);