Instead of removing the data sync support here and re-adding it later I would recommend moving the enhanced sync_inode_metadata earlier in the series. --