Changeset 84876aa4 in mainline for uspace/srv/volsrv/volume.c

Timestamp:

2019-11-15T13:46:34Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

ecb7828

Parents:

b093a62 (diff), d548fc0 (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.

Message:

Merge master into gfx

Mainly to get XCW fixes

File:

• uspace/srv/volsrv/volume.c (modified) (3 diffs)

uspace/srv/volsrv/volume.c

@@ -367 +367 @@
         if (refcount_down(&volume->refcnt)) {
                 /* No more references. Check if volume is persistent. */
-                if (!vol_volume_is_persist(volume)) {
-                        list_remove(&volume->lvolumes);
-                        vol_volume_delete(volume);
-                }
+                list_remove(&volume->lvolumes);
+                vol_volume_delete(volume);
         }
 }
@@ -399 +397 @@
                 /* Volume is now persistent */
                 if (volume->nvolume == NULL) {
+                        /* Prevent volume from being freed */
+                        refcount_up(&volume->refcnt);
+
                         /* Create volume node */
                         rc = sif_trans_begin(volume->volumes->repo, &trans);
@@ -426 +427 @@
                         volume->nvolume = nvolume;
                 } else {
+                        /* Allow volume to be freed */
+                        vol_volume_del_ref(volume);
+
                         /* Update volume node */
                         rc = sif_trans_begin(volume->volumes->repo, &trans);