Merge branch 'ext/josef/fs-eh' into for-next-next-v5.13-20210601

diff --cc fs/btrfs/ctree.h
Simple merge

diff --cc fs/btrfs/extent_io.c
Simple merge

diff --cc fs/btrfs/file.c
Simple merge

diff --cc fs/btrfs/inode.c
Simple merge