Apply patch 3046995 Fix FileSystem.cpp on Linux
After applying the patch, I ran the test suite with no errors.
For this patch, I don't think that means much. I haven't figured
out a good way to test this, yet.