merge revision(s) 50071,50088: [Backport #10998] [Backport #11000]
* ext/-test-/file/fs.c (get_fsname): return filesystem name by statfs/statvfs. [ruby-core:68624] [Bug #10998] * ext/-test-/file/fs.c (get_fsname): try magic number only if f_type is included. [ruby-dev:48913] [Bug #11000]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@50621 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 50071,50088: [Backport #10998] [Backport #11000]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@50621 b2dd03c8-39d4-4d8f-98ff-823fe69b080e