1.1 --- a/include/fs_accessor.h Wed Apr 08 21:25:47 2020 +0200
1.2 +++ b/include/fs_accessor.h Wed Apr 08 23:38:31 2020 +0200
1.3 @@ -50,7 +50,7 @@
1.4
1.5 public:
1.6 explicit Fs_accessor(ext2_filsys fs, ext2_ino_t ino_file, int flags,
1.7 - Pages *pages, size_t size=0);
1.8 + Paging *paging, size_t size=0);
1.9
1.10 /* Accessor methods. */
1.11
2.1 --- a/include/fs_directory_listing_accessor.h Wed Apr 08 21:25:47 2020 +0200
2.2 +++ b/include/fs_directory_listing_accessor.h Wed Apr 08 23:38:31 2020 +0200
2.3 @@ -53,8 +53,8 @@
2.4
2.5 explicit Fs_directory_listing_accessor(ext2_filsys fs, ext2_ino_t dir,
2.6 int flags,
2.7 - Pages *pages, size_t size=SIZE_MAX)
2.8 - : PagingAccessor(pages, size), _fs(fs), _dir(dir), _flags(flags)
2.9 + Paging *paging, size_t size=SIZE_MAX)
2.10 + : PagingAccessor(paging, size), _fs(fs), _dir(dir), _flags(flags)
2.11 {
2.12 }
2.13
3.1 --- a/server/src/fs_accessor.cc Wed Apr 08 21:25:47 2020 +0200
3.2 +++ b/server/src/fs_accessor.cc Wed Apr 08 23:38:31 2020 +0200
3.3 @@ -37,8 +37,8 @@
3.4 /* Initialise an accessor. */
3.5
3.6 Fs_accessor::Fs_accessor(ext2_filsys fs, ext2_ino_t ino_file, int flags,
3.7 - Pages *pages, size_t size)
3.8 -: PagingAccessor(pages, size), _fs(fs), _ino_file(ino_file), _flags(flags)
3.9 + Paging *paging, size_t size)
3.10 +: PagingAccessor(paging, size), _fs(fs), _ino_file(ino_file), _flags(flags)
3.11 {
3.12 /* Initialise the size from the file. */
3.13
4.1 --- a/server/src/fs_user_filesystem.cc Wed Apr 08 21:25:47 2020 +0200
4.2 +++ b/server/src/fs_user_filesystem.cc Wed Apr 08 23:38:31 2020 +0200
4.3 @@ -143,12 +143,12 @@
4.4 {
4.5 if (_image_isfile(_fs, ino_file))
4.6 {
4.7 - accessor = new Fs_accessor(_fs, ino_file, flags, _paging->pages());
4.8 + accessor = new Fs_accessor(_fs, ino_file, flags, _paging);
4.9 printf("Made new accessor!\n");
4.10 }
4.11 else if (_image_isdir(_fs, ino_file))
4.12 {
4.13 - accessor = new Fs_directory_listing_accessor(_fs, ino_file, flags, _paging->pages());
4.14 + accessor = new Fs_directory_listing_accessor(_fs, ino_file, flags, _paging);
4.15 printf("Made new directory accessor!\n");
4.16 }
4.17 else