fs: Merge s3ve3g Part 2

Signed-off-by: Robert Rozic <r.rozic97@gmail.com>
s3ve3g: Fix mismerges

Signed-off-by: Robert Rozic <r.rozic97@gmail.com>