Blaster4385/linux-IllusionX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fs/ntfs3: Always use binary search with entry search

Browse source 
We do not have any reason to keep old linear search in. Before this was
used for error path or if table was so big that it cannot be allocated.
Current binary search implementation won't need error path. Remove old
references to linear entry search.

Signed-off-by: Kari Argillander <kari.argillander@gmail.com>
Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
This commit is contained in:
Kari Argillander 2021-09-02 18:40:50 +03:00 committed by Konstantin Komarov
parent ef9297007e
commit 8e69212253
No known key found for this signature in database
GPG key ID: A9B0331F832407B6
2 changed files with 6 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
fs/ntfs3/index.c
View file

@ -671,22 +671,16 @@ static struct NTFS_DE *hdr_find_e(const struct ntfs_index *indx,
const struct INDEX_HDR *hdr, const void *key,
size_t key_len, const void *ctx, int *diff)
{
struct NTFS_DE *e;
struct NTFS_DE *e, *found = NULL;
NTFS_CMP_FUNC cmp = indx->cmp;
int min_idx = 0, mid_idx, max_idx = 0;
int diff2;
int table_size = 8;
u32 e_size, e_key_len;
u32 end = le32_to_cpu(hdr->used);
u32 off = le32_to_cpu(hdr->de_off);
#ifdef NTFS3_INDEX_BINARY_SEARCH
struct NTFS_DE *found = NULL;
int min_idx = 0, mid_idx, max_idx = 0;
int table_size = 8;
int diff2;
u16 offs[128];
if (end > 0x10000)
goto next;
fill_table:
if (off + sizeof(struct NTFS_DE) > end)
return NULL;
@ -720,7 +714,8 @@ binary_search:
return NULL;
max_idx = 0;
table_size = min(table_size * 2, 128);
table_size = min(table_size * 2,
(int)ARRAY_SIZE(offs));
goto fill_table;
}
} else if (diff2 < 0) {
@ -744,39 +739,6 @@ binary_search:
e = Add2Ptr(hdr, offs[mid_idx]);
goto binary_search;
#endif
next:
/*
* Entries index are sorted.
* Enumerate all entries until we find entry
* that is <= to the search value.
*/
if (off + sizeof(struct NTFS_DE) > end)
return NULL;
e = Add2Ptr(hdr, off);
e_size = le16_to_cpu(e->size);
if (e_size < sizeof(struct NTFS_DE) || off + e_size > end)
return NULL;
off += e_size;
e_key_len = le16_to_cpu(e->key_size);
*diff = (*cmp)(key, key_len, e + 1, e_key_len, ctx);
if (!*diff)
return e;
if (*diff <= 0)
return e;
if (de_is_last(e)) {
*diff = 1;
return e;
}
goto next;
}
/*

3
fs/ntfs3/ntfs.h
View file

@ -21,9 +21,6 @@
/* TODO: Check 4K MFT record and 512 bytes cluster. */
/* Activate this define to use binary search in indexes. */
#define NTFS3_INDEX_BINARY_SEARCH
/* Check each run for marked clusters. */
#define NTFS3_CHECK_FREE_CLST