prepare upstream bugfix of lfs

-> call lfs_dir_fetchmatch with ftag=-1 in order to set the invalid bit
   and never let the function match a dir
This commit is contained in:
grunwald-m
2019-05-17 13:48:37 +02:00
committed by Christopher Haster
parent 6b65737715
commit 64dedee2d1

5
lfs.c
View File

@@ -975,9 +975,9 @@ static lfs_stag_t lfs_dir_fetchmatch(lfs_t *lfs,
static int lfs_dir_fetch(lfs_t *lfs, static int lfs_dir_fetch(lfs_t *lfs,
lfs_mdir_t *dir, const lfs_block_t pair[2]) { lfs_mdir_t *dir, const lfs_block_t pair[2]) {
// note, mask=-1, tag=0 can never match a tag since this // note, mask=-1, tag=-1 can never match a tag since this
// pattern has the invalid bit set // pattern has the invalid bit set
return (int)lfs_dir_fetchmatch(lfs, dir, pair, -1, 0, NULL, NULL, NULL); return (int)lfs_dir_fetchmatch(lfs, dir, pair, -1, -1, NULL, NULL, NULL);
} }
static int lfs_dir_getgstate(lfs_t *lfs, const lfs_mdir_t *dir, static int lfs_dir_getgstate(lfs_t *lfs, const lfs_mdir_t *dir,
@@ -1643,7 +1643,6 @@ relocate:
if (err && (err != LFS_ERR_NOSPC && !exhausted)) { if (err && (err != LFS_ERR_NOSPC && !exhausted)) {
return err; return err;
} }
continue; continue;
} }