Hi Eryu. On Mon, Nov 22, 2021 at 06:18:45PM +0800, Eryu Guan wrote: > On Mon, Nov 22, 2021 at 09:49:17AM +0100, Carlos Maiolino wrote: > > Ping. > > I think this patchset has been applied and pushed to upstream in last > week's update. Would you please check if you could see them after > pulling the latest update? Yeah, I can see them. Thanks! > > Thanks, > Eryu > > > > > > > > > This is the 2nd version of this series to fix test g/643. > > > > > > This version ensures _format_swapfile helper returns the swap size in bytes > > > every time (previous version returned it in a different unit, depending on the > > > swap's size) and updates remaining users of _format_swapfile() to discard its > > > return value. > > > > > > This also slightly change patch 2, making g/643 to use swapon to retrieve swap > > > size (more details in the patch's description). > > > > > > Original cover-letter below. > > > > > > > > > Currently, generic/643 test fails on ext2 and ext3 filesystems when using 1k > > > block sizes. > > > The failure itself happens due the mapping of indirect blocks to iomap extents > > > and the aligment constraints imposed by iomap. Specific details are described in > > > patch 2. > > > > > > To fix the test, I modified it to use the swapfile size described in the swap > > > header (patch 2), and to retrieve such information, at mkswap time, I modified > > > the _format_swapfile() function, and I believe such modification requires its own > > > patch (patch 1). > > > > > > These changes have also been tested on 64k pages (both on arm and PPC) to ensure > > > it doesn't break the test on such architectures. > > > > > > Carlos Maiolino (2): > > > common/rc: Enable _format_swapfile to return the swap size > > > generic/643: Fix for 1k block sizes for ext2 and ext3 > > > > > > common/rc | 10 +++++++--- > > > tests/btrfs/173 | 2 +- > > > tests/btrfs/174 | 2 +- > > > tests/btrfs/175 | 4 ++-- > > > tests/btrfs/176 | 2 +- > > > tests/btrfs/177 | 2 +- > > > tests/generic/356 | 2 +- > > > tests/generic/357 | 2 +- > > > tests/generic/493 | 2 +- > > > tests/generic/494 | 2 +- > > > tests/generic/554 | 2 +- > > > tests/generic/569 | 2 +- > > > tests/generic/643 | 27 +++++++++------------------ > > > 13 files changed, 28 insertions(+), 33 deletions(-) > > > > > > -- > > > 2.31.1 > > > > > > > -- > > Carlos > -- Carlos
