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

• Lines: 33
• Date: Tue Oct 19 17:14:02 1999
• Orig file: v2.2.12/linux/fs/nfsd/nfsfh.c
• Orig date: Sat Mar 20 12:28:14 1999

diff -u --recursive --new-file v2.2.12/linux/fs/nfsd/nfsfh.c linux/fs/nfsd/nfsfh.c
@@ -4,6 +4,7 @@
  * NFS server file handle treatment.
  *
  * Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de>
+ * Portions Copyright (C) 1999 G. Allen Morris III <gam3@acm.org>
  */
 
 #include <linux/sched.h>
@@ -1064,7 +1065,7 @@
 	error = nfserr_perm;
 	if (!rqstp->rq_secure && EX_SECURE(exp)) {
 		printk(KERN_WARNING
-			"nfsd: request from insecure port (%08lx:%d)!\n",
+			"nfsd: request from insecure port (%08x:%d)!\n",
 				ntohl(rqstp->rq_addr.sin_addr.s_addr),
 				ntohs(rqstp->rq_addr.sin_port));
 		goto out;
@@ -1192,6 +1193,7 @@
 	fhp->fh_handle.fh_dcookie = dentry;
 	if (inode) {
 		fhp->fh_handle.fh_ino = ino_t_to_u32(inode->i_ino);
+		fhp->fh_handle.fh_generation = inode->i_generation;
 	}
 	fhp->fh_handle.fh_dirino = ino_t_to_u32(parent->d_inode->i_ino);
 	fhp->fh_handle.fh_dev	 = kdev_t_to_u32(parent->d_inode->i_dev);
@@ -1223,6 +1225,7 @@
 	if (!inode)
 		goto out_negative;
 	fhp->fh_handle.fh_ino = ino_t_to_u32(inode->i_ino);
+	fhp->fh_handle.fh_generation = inode->i_generation;
 out:
 	return;