From: adilger <adilger>
Date: Thu, 15 Aug 2002 20:40:49 +0000 (+0000)
Subject: Fix minor divergence between the -chaos and non-chaos patches.
X-Git-Tag: 0.5.5~145
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=b03e6098e7211491cca62bf7d105b5ab69b138bc;p=fs%2Flustre-release.git

Fix minor divergence between the -chaos and non-chaos patches.
---

diff --git a/lustre/patches/patch-2.4.18-chaos12 b/lustre/patches/patch-2.4.18-chaos12
index 7bf97fa..46f227e 100644
--- a/lustre/patches/patch-2.4.18-chaos12
+++ b/lustre/patches/patch-2.4.18-chaos12
@@ -605,13 +605,13 @@
  		}
  		/* This does the actual lookups.. */
 -		dentry = cached_lookup(nd->dentry, &this, LOOKUP_CONTINUE);
-+		dentry = cached_lookup(nd->dentry, &this, LOOKUP_CONTINUE, it);
++		dentry = cached_lookup(nd->dentry, &this, LOOKUP_CONTINUE, NULL);
  		if (!dentry) {
  			err = -EWOULDBLOCKIO;
  			if (atomic)
  				break;
 -			dentry = real_lookup(nd->dentry, &this, LOOKUP_CONTINUE);
-+			dentry = real_lookup(nd->dentry, &this, LOOKUP_CONTINUE, it);
++			dentry = real_lookup(nd->dentry, &this, LOOKUP_CONTINUE, NULL);
  			err = PTR_ERR(dentry);
  			if (IS_ERR(dentry))
  				break;