# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1627167252 -7200
# Node ID a77b242ed4be10b1855ebb99dc9cee78b4cabc55
# Parent  9c62ddc654a714aedb54a626971a02d3750dc0e6
Simplified user data handling in signatures and attributes by employing the
user_t structure type.

diff -r 9c62ddc654a7 -r a77b242ed4be libfsserver/include/fsserver/ext2_file_opener.h
--- a/libfsserver/include/fsserver/ext2_file_opener.h	Sat Jul 24 18:55:21 2021 +0200
+++ b/libfsserver/include/fsserver/ext2_file_opener.h	Sun Jul 25 00:54:12 2021 +0200
@@ -34,14 +34,11 @@
 {
 protected:
     ext2_filsys _fs;
-    sys_uid_t _uid;
-    sys_gid_t _gid;
-    sys_mode_t _umask;
+    user_t _user;
 
 public:
-    explicit Ext2FileOpener(FilePaging *paging, ext2_filsys fs, sys_uid_t uid,
-                            sys_gid_t gid, sys_mode_t umask)
-    : OpenerResource(paging), _fs(fs), _uid(uid), _gid(gid), _umask(umask)
+    explicit Ext2FileOpener(FilePaging *paging, ext2_filsys fs, user_t user)
+    : OpenerResource(paging), _fs(fs), _user(user)
     {
     }
 
diff -r 9c62ddc654a7 -r a77b242ed4be libfsserver/lib/files/ext2_filesystem.cc
--- a/libfsserver/lib/files/ext2_filesystem.cc	Sat Jul 24 18:55:21 2021 +0200
+++ b/libfsserver/lib/files/ext2_filesystem.cc	Sun Jul 25 00:54:12 2021 +0200
@@ -29,7 +29,8 @@
 long Ext2Filesystem::open_for_user(sys_uid_t uid, sys_gid_t gid,
                                    sys_mode_t umask, l4_cap_idx_t *ref)
 {
-    Resource *resource = new Ext2FileOpener(this, _fs, uid, gid, umask);
+    user_t user = (user_t) {uid, gid, umask};
+    Resource *resource = new Ext2FileOpener(this, _fs, user);
 
     /* Complete the initialisation and start a server in a new thread.
        If the thread does not start, the resource will be finalised. */