Hello Filipe, Thanks for your participation/support. On Thu, Jan 25, 2024 at 11:59:34AM +0000, fdmanana@xxxxxxxxxx wrote: > From: Filipe Manana <fdmanana@xxxxxxxx> > > 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 ? Thanks, Eugeniu
