patch-2.2.4 linux/fs/nfsd/vfs.c

• Lines: 29
• Date: Sat Mar 20 12:28:14 1999
• Orig file: v2.2.3/linux/fs/nfsd/vfs.c
• Orig date: Tue Feb 23 15:21:34 1999

diff -u --recursive --new-file v2.2.3/linux/fs/nfsd/vfs.c linux/fs/nfsd/vfs.c
@@ -11,7 +11,7 @@
  * So if you notice code paths that apparently fail to dput() the
  * dentry, don't worry--they have been taken care of.
  *
- * Copyright (C) 1995, 1996, 1997 Olaf Kirch <okir@monad.swb.de>
+ * Copyright (C) 1995-1999 Olaf Kirch <okir@monad.swb.de>
  */
 
 #include <linux/config.h>
@@ -1139,8 +1139,11 @@
 		goto out;
 	}
 
+	expire_by_dentry(rdentry);
+
 	if (type != S_IFDIR) {
 		/* It's UNLINK */
+
 		err = fh_lock_parent(fhp, rdentry);
 		if (err)
 			goto out;
@@ -1155,6 +1158,7 @@
 	} else {
 		/* It's RMDIR */
 		/* See comments in fs/namei.c:do_rmdir */
+
 		rdentry->d_count++;
 		nfsd_double_down(&dirp->i_sem, &rdentry->d_inode->i_sem);
 		if (!fhp->fh_pre_mtime)