Patch from Andreas Dilger <adilger@clusterfs.com>

If you have ext2_fs.h and ext3_fs.h included at the same time, we are
missing one define used in ext3_should_journal_data() and
ext3_should_order_data() as part of the test_opt() macro (which
defaults to the ext2 definition if both are present).