cmfs: combine no journal support code into jbd2 journal support code

Keeping a single no-jouranl patch introduces more work when I write jbd2
support code. It should be easier to combine no-jouranl and jouranl
support into one patch, which just add jbd2 jouranl support to cmfs.