Please apply commit 92d34134193e ("fs: Fix inconsistency ..." to stable releases