1.1 --- a/libfsserver/include/fsserver/ext2_file_opener.h Sat Jul 24 18:55:21 2021 +0200
1.2 +++ b/libfsserver/include/fsserver/ext2_file_opener.h Sun Jul 25 00:54:12 2021 +0200
1.3 @@ -34,14 +34,11 @@
1.4 {
1.5 protected:
1.6 ext2_filsys _fs;
1.7 - sys_uid_t _uid;
1.8 - sys_gid_t _gid;
1.9 - sys_mode_t _umask;
1.10 + user_t _user;
1.11
1.12 public:
1.13 - explicit Ext2FileOpener(FilePaging *paging, ext2_filsys fs, sys_uid_t uid,
1.14 - sys_gid_t gid, sys_mode_t umask)
1.15 - : OpenerResource(paging), _fs(fs), _uid(uid), _gid(gid), _umask(umask)
1.16 + explicit Ext2FileOpener(FilePaging *paging, ext2_filsys fs, user_t user)
1.17 + : OpenerResource(paging), _fs(fs), _user(user)
1.18 {
1.19 }
1.20
2.1 --- a/libfsserver/lib/files/ext2_filesystem.cc Sat Jul 24 18:55:21 2021 +0200
2.2 +++ b/libfsserver/lib/files/ext2_filesystem.cc Sun Jul 25 00:54:12 2021 +0200
2.3 @@ -29,7 +29,8 @@
2.4 long Ext2Filesystem::open_for_user(sys_uid_t uid, sys_gid_t gid,
2.5 sys_mode_t umask, l4_cap_idx_t *ref)
2.6 {
2.7 - Resource *resource = new Ext2FileOpener(this, _fs, uid, gid, umask);
2.8 + user_t user = (user_t) {uid, gid, umask};
2.9 + Resource *resource = new Ext2FileOpener(this, _fs, user);
2.10
2.11 /* Complete the initialisation and start a server in a new thread.
2.12 If the thread does not start, the resource will be finalised. */