very ghetto merge of upstream changes for f2fs from 3.16