Changeset ebb1489 in mainline for uspace/srv/volsrv/types/volume.h

Timestamp:

2024-10-13T08:23:40Z (2 months ago)

Author:

GitHub <noreply@…>

Children:

0472cf17

Parents:

2a0c827c (diff), b3b79981 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

boba-buba <120932204+boba-buba@…> (2024-10-13 08:23:40)

git-committer:

GitHub <noreply@…> (2024-10-13 08:23:40)

Message:

Merge branch 'HelenOS:master' into topic/packet-capture

File:

• uspace/srv/volsrv/types/volume.h (modified) (4 diffs)

uspace/srv/volsrv/types/volume.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2018 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -41 +41 @@
 #include <refcount.h>
 #include <fibril_synch.h>
-#include <sif.h>
 
 /** Volume */
@@ -57 +56 @@
         /** Mount point */
         char *mountp;
-        /** SIF node for this volume */
-        sif_node_t *nvolume;
 } vol_volume_t;
 
@@ -67 +64 @@
         /** Volumes (list of vol_volume_t) */
         list_t volumes;
-        /** Cconfiguration repo session */
-        sif_sess_t *repo;
-        /** Volumes SIF node */
-        sif_node_t *nvolumes;
         /** Next ID */
         sysarg_t next_id;
+        /** Configuration file path */
+        char *cfg_path;
 } vol_volumes_t;