fix too long line
fix too long line
fix too long line
fix too long line
fix unused variable
fix duplicate definition
seems I was failed to merge something...
PrepareFileStorageForMount can be a class method
fix too long line