47 Commits

Author SHA1 Message Date
zhangjian
f34a9635c9 backport patches from mailline
(cherry picked from commit f54403d3ad38439015d9f524cd0b22177cdd6a8a)
2024-05-30 19:48:50 +08:00
zhangxingrong
1d8a9f90df e2fsprogs: modify dumpe2fs to report free block ranges for bigalloc
(cherry picked from commit 491eee61810b65846fa07ada00d5428e669782f4)
2024-05-30 17:30:56 +08:00
Wenchao Hao
123acfedcf Backport patches from mainline
Signed-off-by: Wenchao Hao <haowenchao2@huawei.com>
(cherry picked from commit 871ef2f92166cfa7c569eb4fb1c42e10944d1589)
2024-05-30 15:03:46 +08:00
Wenchao Hao
f920f49010 debugfs: Fix infinite loop when dump log
There are 2 scenarios which would trigger infinite loop:

1. None log is recorded, then dumplog with "-n", for example:
   debugfs -R "logdump -O -n 10" /dev/xxx
   while /dev/xxx has no valid log recorded.
2. The log area is full and cycle write is triggered, then dumplog with
   debugfs -R "logdump -aOS" /dev/xxx

This patch add a new flag "reverse_flag" to mark if logdump has reached
to tail of logarea, it is default false, and set in macro WRAP().

If reverse_flag is true, and we comes to first_transaction_blocknr
again, just break the logdump loop.

Signed-off-by: Wenchao Hao <haowenchao2@huawei.com>
(cherry picked from commit c45fdac18e07017351b6c102d16b71b253bf7007)
2024-05-30 11:18:35 +08:00
Xinliang Liu
8ee7a34400 Fix rpmlint Provides/Obsoletes unversioned warnings
It is recommended to specify version info for Provides/Obsoletes tags,
see Fedora rpm guide[1] for more details about Obsolete tag usage.

This also can fix below dnf update failure after installing lustre version
e2fsprogs rpm.
$ sudo dnf update
Last metadata expiration check: 0:00:29 ago on Tue Jul  4 11:06:44 2023.
Error:
 Problem 1: cannot install both e2fsprogs-1.46.5-4.oe1.aarch64 and e2fsprogs-1.46.6.wc1-0.oe1.aarch64
  - cannot install the best update candidate for package e2fsprogs-libs-1.46.6.wc1-0.oe1.aarch64
  - cannot install the best update candidate for package e2fsprogs-1.46.6.wc1-0.oe1.aarch64
 Problem 2: problem with installed package e2fsprogs-1.46.6.wc1-0.oe1.aarch64
  - cannot install both e2fsprogs-1.46.5-4.oe1.aarch64 and e2fsprogs-1.46.6.wc1-0.oe1.aarch64
  - cannot install the best update candidate for package libcom_err-1.46.6.wc1-0.oe1.aarch64
(try to add '--allowerasing' to command line to replace conflicting packages or '--skip-broken' to skip uninstallable packages or '--nobest' to us
e not only best candidate packages)

[1] https://docs.fedoraproject.org/en-US/packaging-guidelines/#renaming-or-replacing-existing-packages

Signed-off-by: Xinliang Liu <xinliang.liu@linaro.org>
2023-11-09 03:32:30 +00:00
volcanodragon
12d2647694 fix bad htree checksums in peer mode
(cherry picked from commit b1b24b85c7b086cd66da0eebf986f6499d28b53d)
2023-10-30 14:17:46 +08:00
Weifeng Su
4134e45e6f Backport patches from upstream
Signed-off-by: Weifeng Su <suweifeng1@huawei.com>
2023-06-25 16:28:33 +00:00
tangyuchen
14d5703f39 delete invalid ext4 link
Signed-off-by: tangyuchen <tangyuchen5@huawei.com>
(cherry picked from commit 5ab03c0cec85f03734f7e7a33ff17f0692a3088e)
2023-06-12 14:47:57 +08:00
Zhiqiang Liu
62da9fe82c misc/fsck.c: processes may kill other processes
Fix issue: https://gitee.com/e2fsprogs/issues/I6BSCH

Signed-off-by: Zhiqiang Liu <liuzhiqiang26@huawei.com>
(cherry picked from commit 7762bf942e3de8e5b09d94152ce606cf1ebcfdd3)
2023-03-30 22:58:54 +08:00
lihaoxiang
37174eda15 Upstream patches regress for debugfs, tune2fs and mmp.
Signed-off-by: lihaoxiang <lihaoxiang9@huawei.com>
(cherry picked from commit 2c9d1caad144c08b781819ef3fd782780c5c06a4)
2023-02-09 21:33:29 +08:00
Zhiqiang Liu
6b7044f8c5 unix_io: fix deadlock problem in unix_write_blk64
fix issue:https://gitee.com/src-openeuler/e2fsprogs/issues/I6250B

Signed-off-by: Zhiqiang Liu <liuzhiqiang26@huawei.com>
2022-12-01 15:36:13 +08:00
Zhiqiang Liu
56a0c4264e tune2fs:fix one segfault problem
fix issue:https://gitee.com/src-openeuler/e2fsprogs/issues/I5RYHG

Signed-off-by: Zhiqiang Liu <liuzhiqiang26@huawei.com>
(cherry picked from commit a90d365e90075a29ab564ec29bf6734ed47b587b)
2022-10-14 14:11:59 +08:00
zhanchengbin
482eeeb56c fix ACL-printing tests from community
Signed-off-by: zhanchengbin <zhanchengbin1@huawei.com>
(cherry picked from commit 419607e8b2b09be1f71a44ab8f8d6424f7dcc4da)
2022-09-24 09:12:54 +08:00
Zhiqiang Liu
ca1b20a9d9 debugfs: teach logdump the -n <num_trans> option
fix issue: https://gitee.com/e2fsprogs/issues/I5DAEO

Signed-off-by: Zhiqiang Liu <liuzhiqiang26@huawei.com>
(cherry picked from commit d4ec9ac5ddb3ebba631672bb4ef9cc89d5099ca2)
2022-08-20 14:10:59 +08:00
hifi521
ded4a2e2f9 tune2fs: do not change j_tail_sequence in journal superblock
Signed-off-by: zhanchengbin <zhanchengbin1@huawei.com>
(cherry picked from commit c71e81181176fcc7499c6e66a210643519762e0d)
2022-08-15 15:10:22 +08:00
wzx
0a21d08466 e2fsprogs add sw
Add code related to sw64 in file configure configure.ac aclocal.m4 lib/blkid/llseek.c lib/ext2fs/unix_io.c to support sw64 architecture.

Signed-off-by: wzx <wuzx1226@qq.com>
(cherry picked from commit a30236cefb9a0e9c119a1a18c1a95ed8bf3e736b)
2022-08-11 17:25:31 +08:00
lihaoxiang
25e73cc302 add wrapper header file for i686 and x86_64 then fix conflicts when intall i686 rpms.
(cherry picked from commit 1dd866f5d91b956e916d2953b8210af3bc30b8b8)
2022-06-23 16:02:34 +08:00
Zhiqiang Liu
5e28b9ccd0 e2fsprogs: fix CVE-2022-1304
backport "libext2fs:add santiy check to extent manipulation" patch
to fix CVE-2022-1304.

Fix issue: https://gitee.com/src-openeuler/e2fsprogs/issues/I59OWQ

Signed-off-by: Zhiqiang Liu <liuzhiqiang26@huawei.com>
(cherry picked from commit e742aede043e643a34237d27b48f1709d7662fc2)
2022-05-28 11:43:06 +08:00
loong_C
f9e4c25a1f fix spec changelog date
(cherry picked from commit c6a6f47e0174c4fdfc25411e1030c5386b134e2d)
2022-05-23 23:09:11 +08:00
hifi521
3d476b2bcb e2fsck: handle->level is overflow in ext2fs_extent_get.
Fix issue: https://gitee.com/src-openeuler/e2fsprogs/issues/I4Z2KL

Signed-off-by: zhanchengbin <zhanchengbin1@huawei.com>
(cherry picked from commit 7c66cdaba9d013861449045586b2a9644e955f1e)
2022-05-20 18:04:03 +08:00
zhanchengbin
d9658576ac e2fsck: do not clean up file acl if the inode is truncating type
Fix issue: https://gitee.com/src-openeuler/e2fsprogs/issues/I586JP

Signed-off-by: zhanchengbin <zhanchengbin1@huawei.com>
(cherry picked from commit 0b6416e7f0e7ab514d8b87e9463387b12f64d87e)
2022-05-19 17:28:56 +08:00
zhanchengbin
9c0dca6087 tests: skip m_rootdir_acl if selinux is not disabled
Signed-off-by: zhanchengbin <zhanchengbin1@huawei.com>
(cherry picked from commit 4a0d10630f3fd52db64f98f78a2aeeb14454d87b)
2022-03-18 00:06:31 +08:00
zhanchengbin
0804d785d6 tests: add warning for selinux in m_rootdir_acl
Signed-off-by: zhanchengbin <zhanchengbin1@huawei.com>
(cherry picked from commit 1a14e1037698dba9c5b7ec4bc9f9d8adf8eb9f74)
2022-03-18 00:06:31 +08:00
zhanchengbin
9b918b78b8 libext2fs: don't old the CACHE_MTX while doing I/O
Signed-off-by: zhanchengbin <zhanchengbin1@huawei.com>
(cherry picked from commit e73c0b349c8e71561741ccf29a52f8e758bf3347)
2022-03-10 14:21:30 +08:00
zhanchengbin
d81e6d4145 tests: update expect file for u_direct_io
Signed-off-by: zhanchengbin <zhanchengbin1@huawei.com>
(cherry picked from commit f609d7b91feb11495c84d2442f263644ae3373a3)
2022-03-08 14:16:36 +08:00
zhanchengbin
a8650a5705 e2mmpstatus.8.in: detele filesystem can be UUID or LABEL in manpage
Signed-off-by: zhanchengbin <zhanchengbin1@huawei.com>
(cherry picked from commit ebcbd4c180e1fa3e40fbbe9d771c4be666850266)
2022-03-02 11:39:06 +08:00
zhanchengbin
cfc1f6297b adapt patchs from openEuler-20.03-LTS
Signed-off-by: zhanchengbin <zhanchengbin1@huawei.com>
(cherry picked from commit c9696089e16d7479b6288bffeee1f440b4e7a409)
2022-03-01 21:40:31 +08:00
zhanchengbin
f2ec947902 resize2fs: resize2fs disk hark hardlinks will be error
(cherry picked from commit 198227c4727f5377db6b6c7a8fdd212f74471f61)
2022-03-01 21:40:31 +08:00
zhanchengbin
6614142a48 replace License in spec
(cherry picked from commit 4c1146741d5c3132f3a622aa4fe54bdd650a5d27)
2022-01-27 18:00:47 +08:00
zhanchengbin
d5ff019020 openEuler 22.03 LTS e2fsprogs is upgraded to v1.46.4.
(cherry picked from commit 522db66c5d67eb9011bccc057fc8927ae5d513e9)
2021-11-30 10:52:03 +08:00
zhanchengbin
d31358cc7b integrate community patches
(cherry picked from commit 6a31058170593926b7860c91d868ad2ad1b9c5fa)
2021-11-17 09:32:22 +08:00
lixiaokeng
8f917e848a add newer libreadline.so.8 to dlopen path
(cherry picked from commit 4e4dd9a0c9a63decc11f57ba14b726d40d78f4b5)
2021-09-15 10:49:43 +08:00
chenyanpanHW
7d8f4883bd add necessary BuildRequires audit
(cherry picked from commit 059a6fa5d23c067256f3eb55250a44946d2cc838)
2021-08-20 15:26:36 +08:00
chenyanpanHW
25fb9da4cb
delete -Sgit from %autosetup, and delete BuildRequires git 2021-07-30 22:36:15 +08:00
markeryang
da06a586b7 set help package as install requires 2020-12-28 16:29:41 +08:00
Zhiqiang Liu
8c9e8653aa e2fsprogs: backport upstream patches to fix some problem-epoch2
backport upstream patches to fix some problem-epoch2
In addition, we remove useless patch:
0002-mke2fs-check.patch which is same with
0001-e2fsprogs-set-hugefile-from-4T-to-1T-in-hugefile-tes.patch.

Signed-off-by: Zhiqiang Liu <liuzhiqiang26@huawei.com>
2020-10-30 16:49:49 +08:00
ZhiqiangLiu
1a2f87eb42 e2fsprogs: update to v1.45.6 version
e2fsprogs: update to v1.45.6 version

Signed-off-by: Zhiqiang Liu <lzhq28@mail.ustc.edu.cn>
2020-07-15 21:26:17 +08:00
Wu Bo
6a03ba4af5 rebuild e2fsprogs 2020-07-01 17:36:17 +08:00
Wu Bo
9553f963c1 rebuild package 2020-07-01 14:51:35 +08:00
eulerstorage
2f1d9b2df8 backport patch to fix CVE-2019-5094 2020-02-03 20:28:20 +08:00
eulerstorage
a9add8b164 change path to remove no used file 2020-01-22 18:54:28 +08:00
eulerstorage
32da4c30e3 fix local rpmbuild error 2020-01-22 10:29:08 +08:00
eulerstorage
2028e37c8e backport patch to fix CVE-2019-5188 2020-01-14 20:38:10 +08:00
eulerstorage
bdcdb4e51f update package from 1.44.3 to 1.45.3 2020-01-14 20:33:55 +08:00
eulerstorage
c8ab772f9b update spec 2020-01-13 11:40:07 +08:00
eulerstorage
a985fb41a8 e2fsprogs: Modify the spec file for conforming to specification
Signed-off-by: eulerstorage <eulerstorage@huawei.com>
2019-12-25 17:33:57 +08:00
overweight
7e0d984b5a Package init 2019-09-30 10:37:40 -04:00