Revert "very ghetto merge of upstream changes for f2fs from 3.16"

This reverts commit a40dc5b43357bf3434fd825ca389d9123e7807ec.