Merge branch 'cf/constness-fixes' into next

Small code clean-up around constness area.

* cf/constness-fixes:
  dir: avoid -Wdiscarded-qualifiers in remove_path()
  bloom: remove a misleading const qualifier

diff --cc bloom.c
Simple merge

diff --cc dir.c
Simple merge