Changeset ebb1489 in mainline for uspace/srv/bd/vbd/disk.c

Timestamp:

2024-10-13T08:23:40Z (8 weeks 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/bd/vbd/disk.c (modified) (3 diffs)

uspace/srv/bd/vbd/disk.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -499 +499 @@
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "block_init(%zu)", sid);
-        rc = block_init(sid, 2048);
+        rc = block_init(sid);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed opening block device %s.",
@@ -581 +581 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "block_fini(%zu)", sid);
         block_fini(sid);
+        free(disk->svc_name);
         free(disk);
         return EOK;