diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2020-05-05 15:01:28 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-10-23 23:14:16 +0100 |
commit | 7e71b018512e926a46f5e3ffda45327ea9c17bc4 (patch) | |
tree | 35b5891023fcce320b1f948df9427d7766e9f46e /meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-e2fsck-don-t-try-to-rehash-a-deleted-directory.patch | |
parent | 79d9e24e55cdd8b83148e249bb02e9a521314df2 (diff) | |
download | poky-7e71b018512e926a46f5e3ffda45327ea9c17bc4.tar.gz |
e2fsprogs: update to 1.45.6
Drop backports, and also 0001-misc-create_inode.c-set-dir-s-mode-correctly.patch
as upstream code has been refactored.
(From OE-Core rev: 53947537ed5ab5f9fd213a6fb4295740b5a2ca6b)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit da9fec8592db913d13af3a936ab518e93496be3e)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-e2fsck-don-t-try-to-rehash-a-deleted-directory.patch')
-rw-r--r-- | meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-e2fsck-don-t-try-to-rehash-a-deleted-directory.patch | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-e2fsck-don-t-try-to-rehash-a-deleted-directory.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-e2fsck-don-t-try-to-rehash-a-deleted-directory.patch deleted file mode 100644 index ba4e3a3c97..0000000000 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-e2fsck-don-t-try-to-rehash-a-deleted-directory.patch +++ /dev/null | |||
@@ -1,49 +0,0 @@ | |||
1 | From 71ba13755337e19c9a826dfc874562a36e1b24d3 Mon Sep 17 00:00:00 2001 | ||
2 | From: Theodore Ts'o <tytso@mit.edu> | ||
3 | Date: Thu, 19 Dec 2019 19:45:06 -0500 | ||
4 | Subject: [PATCH] e2fsck: don't try to rehash a deleted directory | ||
5 | |||
6 | If directory has been deleted in pass1[bcd] processing, then we | ||
7 | shouldn't try to rehash the directory in pass 3a when we try to | ||
8 | rehash/reoptimize directories. | ||
9 | |||
10 | Signed-off-by: Theodore Ts'o <tytso@mit.edu> | ||
11 | |||
12 | Upstream-Status: Backport [https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/commit/?id=71ba13755337e19c9a826dfc874562a36e1b24d3] | ||
13 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
14 | --- | ||
15 | e2fsck/pass1b.c | 4 ++++ | ||
16 | e2fsck/rehash.c | 2 ++ | ||
17 | 2 files changed, 6 insertions(+) | ||
18 | |||
19 | diff --git a/e2fsck/pass1b.c b/e2fsck/pass1b.c | ||
20 | index 5693b9cf..bca701ca 100644 | ||
21 | --- a/e2fsck/pass1b.c | ||
22 | +++ b/e2fsck/pass1b.c | ||
23 | @@ -705,6 +705,10 @@ static void delete_file(e2fsck_t ctx, ext2_ino_t ino, | ||
24 | fix_problem(ctx, PR_1B_BLOCK_ITERATE, &pctx); | ||
25 | if (ctx->inode_bad_map) | ||
26 | ext2fs_unmark_inode_bitmap2(ctx->inode_bad_map, ino); | ||
27 | + if (ctx->inode_reg_map) | ||
28 | + ext2fs_unmark_inode_bitmap2(ctx->inode_reg_map, ino); | ||
29 | + ext2fs_unmark_inode_bitmap2(ctx->inode_dir_map, ino); | ||
30 | + ext2fs_unmark_inode_bitmap2(ctx->inode_used_map, ino); | ||
31 | ext2fs_inode_alloc_stats2(fs, ino, -1, LINUX_S_ISDIR(dp->inode.i_mode)); | ||
32 | quota_data_sub(ctx->qctx, &dp->inode, ino, | ||
33 | pb.dup_blocks * fs->blocksize); | ||
34 | diff --git a/e2fsck/rehash.c b/e2fsck/rehash.c | ||
35 | index 3dd1e941..2c908be0 100644 | ||
36 | --- a/e2fsck/rehash.c | ||
37 | +++ b/e2fsck/rehash.c | ||
38 | @@ -1028,6 +1028,8 @@ void e2fsck_rehash_directories(e2fsck_t ctx) | ||
39 | if (!ext2fs_u32_list_iterate(iter, &ino)) | ||
40 | break; | ||
41 | } | ||
42 | + if (!ext2fs_test_inode_bitmap2(ctx->inode_dir_map, ino)) | ||
43 | + continue; | ||
44 | |||
45 | pctx.dir = ino; | ||
46 | if (first) { | ||
47 | -- | ||
48 | 2.24.1 | ||
49 | |||