diff --git a/pkg/sentry/fs/ext/BUILD b/pkg/sentry/fsimpl/ext/BUILD similarity index 81% rename from pkg/sentry/fs/ext/BUILD rename to pkg/sentry/fsimpl/ext/BUILD index a3b1e4bd6..a41101339 100644 --- a/pkg/sentry/fs/ext/BUILD +++ b/pkg/sentry/fsimpl/ext/BUILD @@ -31,7 +31,7 @@ go_library( "symlink.go", "utils.go", ], - importpath = "gvisor.dev/gvisor/pkg/sentry/fs/ext", + importpath = "gvisor.dev/gvisor/pkg/sentry/fsimpl/ext", visibility = ["//pkg/sentry:internal"], deps = [ "//pkg/abi/linux", @@ -41,7 +41,7 @@ go_library( "//pkg/sentry/arch", "//pkg/sentry/context", "//pkg/sentry/fs", - "//pkg/sentry/fs/ext/disklayout", + "//pkg/sentry/fsimpl/ext/disklayout", "//pkg/sentry/kernel/auth", "//pkg/sentry/memmap", "//pkg/sentry/safemem", @@ -62,11 +62,11 @@ go_test( "extent_test.go", ], data = [ - "//pkg/sentry/fs/ext:assets/bigfile.txt", - "//pkg/sentry/fs/ext:assets/file.txt", - "//pkg/sentry/fs/ext:assets/tiny.ext2", - "//pkg/sentry/fs/ext:assets/tiny.ext3", - "//pkg/sentry/fs/ext:assets/tiny.ext4", + "//pkg/sentry/fsimpl/ext:assets/bigfile.txt", + "//pkg/sentry/fsimpl/ext:assets/file.txt", + "//pkg/sentry/fsimpl/ext:assets/tiny.ext2", + "//pkg/sentry/fsimpl/ext:assets/tiny.ext3", + "//pkg/sentry/fsimpl/ext:assets/tiny.ext4", ], embed = [":ext"], deps = [ @@ -74,7 +74,7 @@ go_test( "//pkg/binary", "//pkg/sentry/context", "//pkg/sentry/context/contexttest", - "//pkg/sentry/fs/ext/disklayout", + "//pkg/sentry/fsimpl/ext/disklayout", "//pkg/sentry/kernel/auth", "//pkg/sentry/usermem", "//pkg/sentry/vfs", diff --git a/pkg/sentry/fs/ext/README.md b/pkg/sentry/fsimpl/ext/README.md similarity index 97% rename from pkg/sentry/fs/ext/README.md rename to pkg/sentry/fsimpl/ext/README.md index e212717aa..af00cfda8 100644 --- a/pkg/sentry/fs/ext/README.md +++ b/pkg/sentry/fsimpl/ext/README.md @@ -44,8 +44,8 @@ an internal pointer, it can quickly fragment a structure across memory. As this runs along side a full blown kernel (which is memory intensive), having a fragmented struct might hurt performance. Hence these internal structures, though interfaced, are tightly packed in memory using the same inheritance -pattern that pkg/sentry/vfs uses. The pkg/sentry/fs/ext/disklayout package makes -an execption to this pattern for reasons documented in the package. +pattern that pkg/sentry/vfs uses. The pkg/sentry/fsimpl/ext/disklayout package +makes an execption to this pattern for reasons documented in the package. ### Security diff --git a/pkg/sentry/fs/ext/assets/README.md b/pkg/sentry/fsimpl/ext/assets/README.md similarity index 100% rename from pkg/sentry/fs/ext/assets/README.md rename to pkg/sentry/fsimpl/ext/assets/README.md diff --git a/pkg/sentry/fs/ext/assets/bigfile.txt b/pkg/sentry/fsimpl/ext/assets/bigfile.txt similarity index 100% rename from pkg/sentry/fs/ext/assets/bigfile.txt rename to pkg/sentry/fsimpl/ext/assets/bigfile.txt diff --git a/pkg/sentry/fs/ext/assets/file.txt b/pkg/sentry/fsimpl/ext/assets/file.txt similarity index 100% rename from pkg/sentry/fs/ext/assets/file.txt rename to pkg/sentry/fsimpl/ext/assets/file.txt diff --git a/pkg/sentry/fs/ext/assets/symlink.txt b/pkg/sentry/fsimpl/ext/assets/symlink.txt similarity index 100% rename from pkg/sentry/fs/ext/assets/symlink.txt rename to pkg/sentry/fsimpl/ext/assets/symlink.txt diff --git a/pkg/sentry/fs/ext/assets/tiny.ext2 b/pkg/sentry/fsimpl/ext/assets/tiny.ext2 similarity index 100% rename from pkg/sentry/fs/ext/assets/tiny.ext2 rename to pkg/sentry/fsimpl/ext/assets/tiny.ext2 diff --git a/pkg/sentry/fs/ext/assets/tiny.ext3 b/pkg/sentry/fsimpl/ext/assets/tiny.ext3 similarity index 100% rename from pkg/sentry/fs/ext/assets/tiny.ext3 rename to pkg/sentry/fsimpl/ext/assets/tiny.ext3 diff --git a/pkg/sentry/fs/ext/assets/tiny.ext4 b/pkg/sentry/fsimpl/ext/assets/tiny.ext4 similarity index 100% rename from pkg/sentry/fs/ext/assets/tiny.ext4 rename to pkg/sentry/fsimpl/ext/assets/tiny.ext4 diff --git a/pkg/sentry/fs/ext/benchmark/BUILD b/pkg/sentry/fsimpl/ext/benchmark/BUILD similarity index 90% rename from pkg/sentry/fs/ext/benchmark/BUILD rename to pkg/sentry/fsimpl/ext/benchmark/BUILD index 73999770a..9fddb4c4c 100644 --- a/pkg/sentry/fs/ext/benchmark/BUILD +++ b/pkg/sentry/fsimpl/ext/benchmark/BUILD @@ -9,7 +9,7 @@ go_test( deps = [ "//pkg/sentry/context", "//pkg/sentry/context/contexttest", - "//pkg/sentry/fs/ext", + "//pkg/sentry/fsimpl/ext", "//pkg/sentry/kernel/auth", "//pkg/sentry/vfs", ], diff --git a/pkg/sentry/fs/ext/benchmark/benchmark_test.go b/pkg/sentry/fsimpl/ext/benchmark/benchmark_test.go similarity index 99% rename from pkg/sentry/fs/ext/benchmark/benchmark_test.go rename to pkg/sentry/fsimpl/ext/benchmark/benchmark_test.go index 08f4dd251..10a8083a0 100644 --- a/pkg/sentry/fs/ext/benchmark/benchmark_test.go +++ b/pkg/sentry/fsimpl/ext/benchmark/benchmark_test.go @@ -26,7 +26,7 @@ import ( "gvisor.dev/gvisor/pkg/sentry/context" "gvisor.dev/gvisor/pkg/sentry/context/contexttest" - "gvisor.dev/gvisor/pkg/sentry/fs/ext" + "gvisor.dev/gvisor/pkg/sentry/fsimpl/ext" "gvisor.dev/gvisor/pkg/sentry/kernel/auth" "gvisor.dev/gvisor/pkg/sentry/vfs" ) diff --git a/pkg/sentry/fs/ext/benchmark/make_deep_ext4.sh b/pkg/sentry/fsimpl/ext/benchmark/make_deep_ext4.sh similarity index 100% rename from pkg/sentry/fs/ext/benchmark/make_deep_ext4.sh rename to pkg/sentry/fsimpl/ext/benchmark/make_deep_ext4.sh diff --git a/pkg/sentry/fs/ext/block_map_file.go b/pkg/sentry/fsimpl/ext/block_map_file.go similarity index 100% rename from pkg/sentry/fs/ext/block_map_file.go rename to pkg/sentry/fsimpl/ext/block_map_file.go diff --git a/pkg/sentry/fs/ext/block_map_test.go b/pkg/sentry/fsimpl/ext/block_map_test.go similarity index 98% rename from pkg/sentry/fs/ext/block_map_test.go rename to pkg/sentry/fsimpl/ext/block_map_test.go index f8dd6bf9f..213aa3919 100644 --- a/pkg/sentry/fs/ext/block_map_test.go +++ b/pkg/sentry/fsimpl/ext/block_map_test.go @@ -21,7 +21,7 @@ import ( "github.com/google/go-cmp/cmp" "gvisor.dev/gvisor/pkg/binary" - "gvisor.dev/gvisor/pkg/sentry/fs/ext/disklayout" + "gvisor.dev/gvisor/pkg/sentry/fsimpl/ext/disklayout" ) // These consts are for mocking the block map tree. diff --git a/pkg/sentry/fs/ext/dentry.go b/pkg/sentry/fsimpl/ext/dentry.go similarity index 100% rename from pkg/sentry/fs/ext/dentry.go rename to pkg/sentry/fsimpl/ext/dentry.go diff --git a/pkg/sentry/fs/ext/directory.go b/pkg/sentry/fsimpl/ext/directory.go similarity index 99% rename from pkg/sentry/fs/ext/directory.go rename to pkg/sentry/fsimpl/ext/directory.go index 1ba8bf54c..b51f3e18d 100644 --- a/pkg/sentry/fs/ext/directory.go +++ b/pkg/sentry/fsimpl/ext/directory.go @@ -22,7 +22,7 @@ import ( "gvisor.dev/gvisor/pkg/log" "gvisor.dev/gvisor/pkg/sentry/context" "gvisor.dev/gvisor/pkg/sentry/fs" - "gvisor.dev/gvisor/pkg/sentry/fs/ext/disklayout" + "gvisor.dev/gvisor/pkg/sentry/fsimpl/ext/disklayout" "gvisor.dev/gvisor/pkg/sentry/memmap" "gvisor.dev/gvisor/pkg/sentry/vfs" "gvisor.dev/gvisor/pkg/syserror" diff --git a/pkg/sentry/fs/ext/disklayout/BUILD b/pkg/sentry/fsimpl/ext/disklayout/BUILD similarity index 93% rename from pkg/sentry/fs/ext/disklayout/BUILD rename to pkg/sentry/fsimpl/ext/disklayout/BUILD index dde15110d..907d35b7e 100644 --- a/pkg/sentry/fs/ext/disklayout/BUILD +++ b/pkg/sentry/fsimpl/ext/disklayout/BUILD @@ -22,7 +22,7 @@ go_library( "superblock_old.go", "test_utils.go", ], - importpath = "gvisor.dev/gvisor/pkg/sentry/fs/ext/disklayout", + importpath = "gvisor.dev/gvisor/pkg/sentry/fsimpl/ext/disklayout", visibility = ["//pkg/sentry:internal"], deps = [ "//pkg/abi/linux", diff --git a/pkg/sentry/fs/ext/disklayout/block_group.go b/pkg/sentry/fsimpl/ext/disklayout/block_group.go similarity index 100% rename from pkg/sentry/fs/ext/disklayout/block_group.go rename to pkg/sentry/fsimpl/ext/disklayout/block_group.go diff --git a/pkg/sentry/fs/ext/disklayout/block_group_32.go b/pkg/sentry/fsimpl/ext/disklayout/block_group_32.go similarity index 100% rename from pkg/sentry/fs/ext/disklayout/block_group_32.go rename to pkg/sentry/fsimpl/ext/disklayout/block_group_32.go diff --git a/pkg/sentry/fs/ext/disklayout/block_group_64.go b/pkg/sentry/fsimpl/ext/disklayout/block_group_64.go similarity index 100% rename from pkg/sentry/fs/ext/disklayout/block_group_64.go rename to pkg/sentry/fsimpl/ext/disklayout/block_group_64.go diff --git a/pkg/sentry/fs/ext/disklayout/block_group_test.go b/pkg/sentry/fsimpl/ext/disklayout/block_group_test.go similarity index 100% rename from pkg/sentry/fs/ext/disklayout/block_group_test.go rename to pkg/sentry/fsimpl/ext/disklayout/block_group_test.go diff --git a/pkg/sentry/fs/ext/disklayout/dirent.go b/pkg/sentry/fsimpl/ext/disklayout/dirent.go similarity index 100% rename from pkg/sentry/fs/ext/disklayout/dirent.go rename to pkg/sentry/fsimpl/ext/disklayout/dirent.go diff --git a/pkg/sentry/fs/ext/disklayout/dirent_new.go b/pkg/sentry/fsimpl/ext/disklayout/dirent_new.go similarity index 100% rename from pkg/sentry/fs/ext/disklayout/dirent_new.go rename to pkg/sentry/fsimpl/ext/disklayout/dirent_new.go diff --git a/pkg/sentry/fs/ext/disklayout/dirent_old.go b/pkg/sentry/fsimpl/ext/disklayout/dirent_old.go similarity index 100% rename from pkg/sentry/fs/ext/disklayout/dirent_old.go rename to pkg/sentry/fsimpl/ext/disklayout/dirent_old.go diff --git a/pkg/sentry/fs/ext/disklayout/dirent_test.go b/pkg/sentry/fsimpl/ext/disklayout/dirent_test.go similarity index 100% rename from pkg/sentry/fs/ext/disklayout/dirent_test.go rename to pkg/sentry/fsimpl/ext/disklayout/dirent_test.go diff --git a/pkg/sentry/fs/ext/disklayout/disklayout.go b/pkg/sentry/fsimpl/ext/disklayout/disklayout.go similarity index 100% rename from pkg/sentry/fs/ext/disklayout/disklayout.go rename to pkg/sentry/fsimpl/ext/disklayout/disklayout.go diff --git a/pkg/sentry/fs/ext/disklayout/extent.go b/pkg/sentry/fsimpl/ext/disklayout/extent.go similarity index 100% rename from pkg/sentry/fs/ext/disklayout/extent.go rename to pkg/sentry/fsimpl/ext/disklayout/extent.go diff --git a/pkg/sentry/fs/ext/disklayout/extent_test.go b/pkg/sentry/fsimpl/ext/disklayout/extent_test.go similarity index 100% rename from pkg/sentry/fs/ext/disklayout/extent_test.go rename to pkg/sentry/fsimpl/ext/disklayout/extent_test.go diff --git a/pkg/sentry/fs/ext/disklayout/inode.go b/pkg/sentry/fsimpl/ext/disklayout/inode.go similarity index 100% rename from pkg/sentry/fs/ext/disklayout/inode.go rename to pkg/sentry/fsimpl/ext/disklayout/inode.go diff --git a/pkg/sentry/fs/ext/disklayout/inode_new.go b/pkg/sentry/fsimpl/ext/disklayout/inode_new.go similarity index 100% rename from pkg/sentry/fs/ext/disklayout/inode_new.go rename to pkg/sentry/fsimpl/ext/disklayout/inode_new.go diff --git a/pkg/sentry/fs/ext/disklayout/inode_old.go b/pkg/sentry/fsimpl/ext/disklayout/inode_old.go similarity index 100% rename from pkg/sentry/fs/ext/disklayout/inode_old.go rename to pkg/sentry/fsimpl/ext/disklayout/inode_old.go diff --git a/pkg/sentry/fs/ext/disklayout/inode_test.go b/pkg/sentry/fsimpl/ext/disklayout/inode_test.go similarity index 100% rename from pkg/sentry/fs/ext/disklayout/inode_test.go rename to pkg/sentry/fsimpl/ext/disklayout/inode_test.go diff --git a/pkg/sentry/fs/ext/disklayout/superblock.go b/pkg/sentry/fsimpl/ext/disklayout/superblock.go similarity index 100% rename from pkg/sentry/fs/ext/disklayout/superblock.go rename to pkg/sentry/fsimpl/ext/disklayout/superblock.go diff --git a/pkg/sentry/fs/ext/disklayout/superblock_32.go b/pkg/sentry/fsimpl/ext/disklayout/superblock_32.go similarity index 100% rename from pkg/sentry/fs/ext/disklayout/superblock_32.go rename to pkg/sentry/fsimpl/ext/disklayout/superblock_32.go diff --git a/pkg/sentry/fs/ext/disklayout/superblock_64.go b/pkg/sentry/fsimpl/ext/disklayout/superblock_64.go similarity index 100% rename from pkg/sentry/fs/ext/disklayout/superblock_64.go rename to pkg/sentry/fsimpl/ext/disklayout/superblock_64.go diff --git a/pkg/sentry/fs/ext/disklayout/superblock_old.go b/pkg/sentry/fsimpl/ext/disklayout/superblock_old.go similarity index 100% rename from pkg/sentry/fs/ext/disklayout/superblock_old.go rename to pkg/sentry/fsimpl/ext/disklayout/superblock_old.go diff --git a/pkg/sentry/fs/ext/disklayout/superblock_test.go b/pkg/sentry/fsimpl/ext/disklayout/superblock_test.go similarity index 100% rename from pkg/sentry/fs/ext/disklayout/superblock_test.go rename to pkg/sentry/fsimpl/ext/disklayout/superblock_test.go diff --git a/pkg/sentry/fs/ext/disklayout/test_utils.go b/pkg/sentry/fsimpl/ext/disklayout/test_utils.go similarity index 100% rename from pkg/sentry/fs/ext/disklayout/test_utils.go rename to pkg/sentry/fsimpl/ext/disklayout/test_utils.go diff --git a/pkg/sentry/fs/ext/ext.go b/pkg/sentry/fsimpl/ext/ext.go similarity index 98% rename from pkg/sentry/fs/ext/ext.go rename to pkg/sentry/fsimpl/ext/ext.go index 632ba97f8..f10accafc 100644 --- a/pkg/sentry/fs/ext/ext.go +++ b/pkg/sentry/fsimpl/ext/ext.go @@ -24,7 +24,7 @@ import ( "gvisor.dev/gvisor/pkg/fd" "gvisor.dev/gvisor/pkg/log" "gvisor.dev/gvisor/pkg/sentry/context" - "gvisor.dev/gvisor/pkg/sentry/fs/ext/disklayout" + "gvisor.dev/gvisor/pkg/sentry/fsimpl/ext/disklayout" "gvisor.dev/gvisor/pkg/sentry/kernel/auth" "gvisor.dev/gvisor/pkg/sentry/vfs" "gvisor.dev/gvisor/pkg/syserror" diff --git a/pkg/sentry/fs/ext/ext_test.go b/pkg/sentry/fsimpl/ext/ext_test.go similarity index 99% rename from pkg/sentry/fs/ext/ext_test.go rename to pkg/sentry/fsimpl/ext/ext_test.go index 31da80ed9..49b57a2d6 100644 --- a/pkg/sentry/fs/ext/ext_test.go +++ b/pkg/sentry/fsimpl/ext/ext_test.go @@ -27,7 +27,7 @@ import ( "gvisor.dev/gvisor/pkg/abi/linux" "gvisor.dev/gvisor/pkg/sentry/context" "gvisor.dev/gvisor/pkg/sentry/context/contexttest" - "gvisor.dev/gvisor/pkg/sentry/fs/ext/disklayout" + "gvisor.dev/gvisor/pkg/sentry/fsimpl/ext/disklayout" "gvisor.dev/gvisor/pkg/sentry/kernel/auth" "gvisor.dev/gvisor/pkg/sentry/usermem" "gvisor.dev/gvisor/pkg/sentry/vfs" @@ -37,7 +37,7 @@ import ( ) const ( - assetsDir = "pkg/sentry/fs/ext/assets" + assetsDir = "pkg/sentry/fsimpl/ext/assets" ) var ( diff --git a/pkg/sentry/fs/ext/extent_file.go b/pkg/sentry/fsimpl/ext/extent_file.go similarity index 99% rename from pkg/sentry/fs/ext/extent_file.go rename to pkg/sentry/fsimpl/ext/extent_file.go index 1b9bf449b..38b68a2d3 100644 --- a/pkg/sentry/fs/ext/extent_file.go +++ b/pkg/sentry/fsimpl/ext/extent_file.go @@ -19,7 +19,7 @@ import ( "sort" "gvisor.dev/gvisor/pkg/binary" - "gvisor.dev/gvisor/pkg/sentry/fs/ext/disklayout" + "gvisor.dev/gvisor/pkg/sentry/fsimpl/ext/disklayout" "gvisor.dev/gvisor/pkg/syserror" ) diff --git a/pkg/sentry/fs/ext/extent_test.go b/pkg/sentry/fsimpl/ext/extent_test.go similarity index 99% rename from pkg/sentry/fs/ext/extent_test.go rename to pkg/sentry/fsimpl/ext/extent_test.go index d03cd564f..42d0a484b 100644 --- a/pkg/sentry/fs/ext/extent_test.go +++ b/pkg/sentry/fsimpl/ext/extent_test.go @@ -22,7 +22,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" "gvisor.dev/gvisor/pkg/binary" - "gvisor.dev/gvisor/pkg/sentry/fs/ext/disklayout" + "gvisor.dev/gvisor/pkg/sentry/fsimpl/ext/disklayout" ) const ( diff --git a/pkg/sentry/fs/ext/file_description.go b/pkg/sentry/fsimpl/ext/file_description.go similarity index 100% rename from pkg/sentry/fs/ext/file_description.go rename to pkg/sentry/fsimpl/ext/file_description.go diff --git a/pkg/sentry/fs/ext/filesystem.go b/pkg/sentry/fsimpl/ext/filesystem.go similarity index 99% rename from pkg/sentry/fs/ext/filesystem.go rename to pkg/sentry/fsimpl/ext/filesystem.go index e08839f48..2d15e8aaf 100644 --- a/pkg/sentry/fs/ext/filesystem.go +++ b/pkg/sentry/fsimpl/ext/filesystem.go @@ -21,7 +21,7 @@ import ( "gvisor.dev/gvisor/pkg/abi/linux" "gvisor.dev/gvisor/pkg/sentry/context" - "gvisor.dev/gvisor/pkg/sentry/fs/ext/disklayout" + "gvisor.dev/gvisor/pkg/sentry/fsimpl/ext/disklayout" "gvisor.dev/gvisor/pkg/sentry/vfs" "gvisor.dev/gvisor/pkg/syserror" ) diff --git a/pkg/sentry/fs/ext/inode.go b/pkg/sentry/fsimpl/ext/inode.go similarity index 99% rename from pkg/sentry/fs/ext/inode.go rename to pkg/sentry/fsimpl/ext/inode.go index 178bd6376..e6c847a71 100644 --- a/pkg/sentry/fs/ext/inode.go +++ b/pkg/sentry/fsimpl/ext/inode.go @@ -20,7 +20,7 @@ import ( "sync/atomic" "gvisor.dev/gvisor/pkg/abi/linux" - "gvisor.dev/gvisor/pkg/sentry/fs/ext/disklayout" + "gvisor.dev/gvisor/pkg/sentry/fsimpl/ext/disklayout" "gvisor.dev/gvisor/pkg/sentry/kernel/auth" "gvisor.dev/gvisor/pkg/sentry/vfs" "gvisor.dev/gvisor/pkg/syserror" diff --git a/pkg/sentry/fs/ext/regular_file.go b/pkg/sentry/fsimpl/ext/regular_file.go similarity index 100% rename from pkg/sentry/fs/ext/regular_file.go rename to pkg/sentry/fsimpl/ext/regular_file.go diff --git a/pkg/sentry/fs/ext/symlink.go b/pkg/sentry/fsimpl/ext/symlink.go similarity index 100% rename from pkg/sentry/fs/ext/symlink.go rename to pkg/sentry/fsimpl/ext/symlink.go diff --git a/pkg/sentry/fs/ext/utils.go b/pkg/sentry/fsimpl/ext/utils.go similarity index 98% rename from pkg/sentry/fs/ext/utils.go rename to pkg/sentry/fsimpl/ext/utils.go index 3d89d664d..d8b728f8c 100644 --- a/pkg/sentry/fs/ext/utils.go +++ b/pkg/sentry/fsimpl/ext/utils.go @@ -18,7 +18,7 @@ import ( "io" "gvisor.dev/gvisor/pkg/binary" - "gvisor.dev/gvisor/pkg/sentry/fs/ext/disklayout" + "gvisor.dev/gvisor/pkg/sentry/fsimpl/ext/disklayout" "gvisor.dev/gvisor/pkg/syserror" )