From: adilger <adilger>
Date: Wed, 7 Apr 2004 21:53:00 +0000 (+0000)
Subject: Fix patch breakage.
X-Git-Tag: 1.2.2~102
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=a376220fcfeb73b227c859e5b26ea200e2779364;p=fs%2Flustre-release.git

Fix patch breakage.
---

diff --git a/lustre/kernel_patches/patches/vfs_intent-2.4.18-18-chaos65.patch b/lustre/kernel_patches/patches/vfs_intent-2.4.18-18-chaos65.patch
index 7293f24..dd07ef3 100644
--- a/lustre/kernel_patches/patches/vfs_intent-2.4.18-18-chaos65.patch
+++ b/lustre/kernel_patches/patches/vfs_intent-2.4.18-18-chaos65.patch
@@ -458,11 +458,10 @@ Index: linux-2.4.18-p4smp/fs/namei.c
  				break;
  		}
  		goto return_base;
-@@ -645,7 +684,26 @@ return_reval:
+@@ -645,6 +684,27 @@ return_reval:
  		 * Check the cached dentry for staleness.
  		 */
  		dentry = nd->dentry;
--		if (dentry && dentry->d_op && dentry->d_op->d_revalidate) {
 +		if (dentry && dentry->d_op && dentry->d_op->d_revalidate_it) {
 +			err = -ESTALE;
 +			if (!dentry->d_op->d_revalidate_it(dentry, 0, it)) {
@@ -483,11 +482,10 @@ Index: linux-2.4.18-p4smp/fs/namei.c
 +			}
 +			if (!nd->dentry->d_inode)
 +				goto no_inode;
-+		}
-+		else if (dentry && dentry->d_op && dentry->d_op->d_revalidate){
++		} else
+ 		if (dentry && dentry->d_op && dentry->d_op->d_revalidate) {
  			err = -ESTALE;
  			if (!dentry->d_op->d_revalidate(dentry, 0)) {
- 				d_invalidate(dentry);
 @@ -658,15 +716,28 @@ out_dput:
  		dput(dentry);
  		break;