From: Anton Altaparmakov <aia21@cantab.net>
Date: Thu, 8 Sep 2005 19:29:50 +0000 (+0100)
Subject: NTFS: Fix a bug in fs/ntfs/index.c::ntfs_index_lookup().  When the returned
X-Git-Tag: v2.6.14-rc1~509
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e08ceaeacd5d300aaad166f2eef8bfc37e09831;p=linux-2.6

NTFS: Fix a bug in fs/ntfs/index.c::ntfs_index_lookup().  When the returned
      index entry is in the index root, we forgot to set the @ir pointer in
      the index context.  Thanks for Yura Pakhuchiy for finding this bug.

Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
---

diff --git a/fs/ntfs/ChangeLog b/fs/ntfs/ChangeLog
index 39dca6dced..1168d3ed2b 100644
--- a/fs/ntfs/ChangeLog
+++ b/fs/ntfs/ChangeLog
@@ -55,6 +55,9 @@ ToDo/Notes:
 	  length is zero.
 	- Add runlist.[hc]::ntfs_rl_punch_nolock() which punches a caller
 	  specified hole into a runlist.
+	- Fix a bug in fs/ntfs/index.c::ntfs_index_lookup().  When the returned
+	  index entry is in the index root, we forgot to set the @ir pointer in
+	  the index context.  Thanks to Yura Pakhuchiy for finding this bug.
 
 2.1.23 - Implement extension of resident files and make writing safe as well as
 	 many bug fixes, cleanups, and enhancements...
diff --git a/fs/ntfs/index.c b/fs/ntfs/index.c
index 11fd5307d7..8f2d572754 100644
--- a/fs/ntfs/index.c
+++ b/fs/ntfs/index.c
@@ -205,6 +205,7 @@ int ntfs_index_lookup(const void *key, const int key_len,
 				&ie->key, key_len)) {
 ir_done:
 			ictx->is_in_root = TRUE;
+			ictx->ir = ir;
 			ictx->actx = actx;
 			ictx->base_ni = base_ni;
 			ictx->ia = NULL;