Changes in uspace/srv/volsrv/volume.c [63c1dd5:9e45a41] in mainline

File:

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

uspace/srv/volsrv/volume.c

@@ -96 +96 @@
 static void vol_volume_delete(vol_volume_t *volume)
 {
-        log_msg(LOG_DEFAULT, LVL_NOTE, "Freeing volume %p", volume);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "Freeing volume %p", volume);
 
         free(volume->label);
@@ -219 +219 @@
 {
         assert(fibril_mutex_is_locked(&volumes->lock));
-        log_msg(LOG_DEFAULT, LVL_NOTE, "vol_volume_add_locked(%p)", volume);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "vol_volume_add_locked(%p)", volume);
 
         volume->volumes = volumes;
@@ -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);