fs: Merge s3ve3f Part 2

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