Distinguish Element and Linker for ilist.

Furthermore, allow for the specification of an ElementMapper. This allows a
single "Element" type to exist on multiple inline lists, and work without
having to embed the entry type.

This is a requisite change for supporting a per-Inode list of Dirents.

PiperOrigin-RevId: 211467497
Change-Id: If2768999b43e03fdaecf8ed15f435fe37518d163

5 files changed, 8 insertions, 0 deletions

diff --git a/pkg/sentry/fs/BUILD b/pkg/sentry/fs/BUILD
index 18cd5ae8e..a949fffbf 100644
--- a/pkg/sentry/fs/BUILD
+++ b/pkg/sentry/fs/BUILD
@@ -78,6 +78,7 @@ go_template_instance(
     template = "//pkg/ilist:generic_list",
     types = {
         "Linker": "*Dirent",
+        "Element": "*Dirent",
     },
 )
 
diff --git a/pkg/sentry/kernel/BUILD b/pkg/sentry/kernel/BUILD
index 0bc735550..7eb2bffeb 100644
--- a/pkg/sentry/kernel/BUILD
+++ b/pkg/sentry/kernel/BUILD
@@ -10,6 +10,7 @@ go_template_instance(
     prefix = "pendingSignal",
     template = "//pkg/ilist:generic_list",
     types = {
+        "Element": "*pendingSignal",
         "Linker": "*pendingSignal",
     },
 )
@@ -21,6 +22,7 @@ go_template_instance(
     prefix = "processGroup",
     template = "//pkg/ilist:generic_list",
     types = {
+        "Element": "*ProcessGroup",
         "Linker": "*ProcessGroup",
     },
 )
@@ -43,6 +45,7 @@ go_template_instance(
     prefix = "session",
     template = "//pkg/ilist:generic_list",
     types = {
+        "Element": "*Session",
         "Linker": "*Session",
     },
 )
@@ -54,6 +57,7 @@ go_template_instance(
     prefix = "task",
     template = "//pkg/ilist:generic_list",
     types = {
+        "Element": "*Task",
         "Linker": "*Task",
     },
 )
diff --git a/pkg/sentry/kernel/futex/BUILD b/pkg/sentry/kernel/futex/BUILD
index b44a26974..0ff5b0a95 100644
--- a/pkg/sentry/kernel/futex/BUILD
+++ b/pkg/sentry/kernel/futex/BUILD
@@ -10,6 +10,7 @@ go_template_instance(
     prefix = "waiter",
     template = "//pkg/ilist:generic_list",
     types = {
+        "Element": "*Waiter",
         "Linker": "*Waiter",
     },
 )
diff --git a/pkg/sentry/kernel/semaphore/BUILD b/pkg/sentry/kernel/semaphore/BUILD
index e7fa44e2c..bdcf4ce5c 100644
--- a/pkg/sentry/kernel/semaphore/BUILD
+++ b/pkg/sentry/kernel/semaphore/BUILD
@@ -10,6 +10,7 @@ go_template_instance(
     prefix = "waiter",
     template = "//pkg/ilist:generic_list",
     types = {
+        "Element": "*waiter",
         "Linker": "*waiter",
     },
 )
diff --git a/pkg/sentry/mm/BUILD b/pkg/sentry/mm/BUILD
index bbdfae247..ad9231774 100644
--- a/pkg/sentry/mm/BUILD
+++ b/pkg/sentry/mm/BUILD
@@ -67,6 +67,7 @@ go_template_instance(
     prefix = "io",
     template = "//pkg/ilist:generic_list",
     types = {
+        "Element": "*ioResult",
         "Linker": "*ioResult",
     },
 )