On Fri, Jan 26, 2024 at 6:55 PM Eugeniu Rosca erosca@de.adit-jv.com wrote:
Hello Filipe,
Thanks for your participation/support.
On Thu, Jan 25, 2024 at 11:59:34AM +0000, fdmanana@kernel.org wrote:
From: Filipe Manana fdmanana@suse.com
Here follows the backport of some directory related fixes for the stable 5.15 tree. I tested these on top of 5.15.147.
These were recently requested at:
https:// lore.kernel.org/linux-btrfs/20240124225522.GA2614102@lxhi-087/
Filipe Manana (4): btrfs: fix infinite directory reads btrfs: set last dir index to the current last index when opening dir btrfs: refresh dir last index during a rewinddir(3) call btrfs: fix race between reading a directory and adding entries to it
fs/btrfs/ctree.h | 1 + fs/btrfs/delayed-inode.c | 5 +- fs/btrfs/delayed-inode.h | 1 + fs/btrfs/inode.c | 150 +++++++++++++++++++++++++-------------- 4 files changed, 102 insertions(+), 55 deletions(-)
The conflict resolution looks accurate to a non-expert eye.
I can also confirm there are no new findings reported by:
- make W=1
- make C=2
- cppcheck --enable=all --force --inconclusive
- PVS-Studio
PS: Could you help me out how (and if at all possible) to preserve the Author date of the original patch when downloading and applying the 'raw' file provided by lore.kernel.org ?
If I understand you correctly, you applied the diff of patches directly with the "patch" command.
To get kernel patches and apply them easily, use the b4 tool available at:
git://git.kernel.org/pub/scm/utils/b4/b4.git
Then in the kernel source directory do this:
b4 am 'cover.1706183427.git.fdmanana@suse.com'
It will create 2 files:
20240125_fdmanana_btrfs_some_directory_fixes_for_stable_5_15.cover 20240125_fdmanana_btrfs_some_directory_fixes_for_stable_5_15.mbox
The first is just the cover letter, the second contains the patches. To apply them, just do:
git am 20240125_fdmanana_btrfs_some_directory_fixes_for_stable_5_15.mbox
Hope that answers your question.
Thanks, Eugeniu