From dd29b235323f2f1c0df6576f822324dc519107fa Mon Sep 17 00:00:00 2001 From: Anton Altaparmakov Date: Thu, 8 Sep 2005 20:29:50 +0100 Subject: [PATCH] --- yaml --- r: 7763 b: refs/heads/master c: 8e08ceaeacd5d300aaad166f2eef8bfc37e09831 h: refs/heads/master i: 7761: e83f070cab9ea530b88f10e9104c847c733d6ab5 7759: 6011e1603e5988609d691111b98edce88d2105a2 v: v3 --- [refs] | 2 +- trunk/fs/ntfs/ChangeLog | 3 +++ trunk/fs/ntfs/index.c | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 1ee04116bfde..47d6f076ed55 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6e48321a40610f7213e3ac75ba234f6f8b3ed5f5 +refs/heads/master: 8e08ceaeacd5d300aaad166f2eef8bfc37e09831 diff --git a/trunk/fs/ntfs/ChangeLog b/trunk/fs/ntfs/ChangeLog index 39dca6dced11..1168d3ed2bec 100644 --- a/trunk/fs/ntfs/ChangeLog +++ b/trunk/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/trunk/fs/ntfs/index.c b/trunk/fs/ntfs/index.c index 11fd5307d780..8f2d5727546f 100644 --- a/trunk/fs/ntfs/index.c +++ b/trunk/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;