fileserver.s3fs: avoid shadowing dir() built-in
Merge pull request #16757 from hulu/dir-shadowing

fileserver.s3fs: avoid shadowing dir() built-in