Extend idea of Prefer Mounted Volumes to mean a volume about

[bacula/bacula] / bacula / src / stored / spool.c

diff --git a/bacula/src/stored/spool.c b/bacula/src/stored/spool.c
index aaaed4d087a8e28f56f1725f85baa73ccf8da3f5..bf57c08ad623c9ed2dabb9f1d1e0e6a60b0c6b75 100644 (file)
--- a/bacula/src/stored/spool.c
+++ b/bacula/src/stored/spool.c
@@ -234,7 +234,7 @@ static bool despool_data(DCR *dcr, bool commit)
    }
    dcr->despool_wait = true;
    dcr->spooling = false;
-   lock_device(dcr->dev);
+   dcr->dev->r_dlock();
    dcr->despool_wait = false;
    dcr->despooling = true;
    dcr->dev_locked = true;
@@ -253,7 +253,7 @@ static bool despool_data(DCR *dcr, bool commit)
    rdev->max_block_size = dcr->dev->max_block_size;
    rdev->min_block_size = dcr->dev->min_block_size;
    rdev->device = dcr->dev->device;
-   rdcr = new_dcr(NULL, rdev);
+   rdcr = new_dcr(jcr, rdev);
    rdcr->spool_fd = dcr->spool_fd;
    rdcr->jcr = jcr;                   /* set a valid jcr */
    block = dcr->block;                /* save block */
@@ -330,7 +330,7 @@ static bool despool_data(DCR *dcr, bool commit)
    /* If doing a commit, leave the device locked -- unlocked in release_device() */
    if (!commit) {
       dcr->dev_locked = false;
-      dcr->dev->unlock();
+      dcr->dev->dunlock();
    }
    return ok;
 }