Merge "ufs: fix incorrect return value about SUCCESS and FAILED"