add PostgreSQL support

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

diff --git a/bacula/src/stored/acquire.c b/bacula/src/stored/acquire.c
index 85e1aef4aa611e6570ae6113ba0991696935f8a8..5cfb31bb6f5570efc2ea0a71a5c6ecd005b181bf 100644 (file)
--- a/bacula/src/stored/acquire.c
+++ b/bacula/src/stored/acquire.c
@@ -47,7 +47,8 @@ int acquire_device_for_read(JCR *jcr, DEVICE *dev, DEV_BLOCK *block)
    int i;
 
    if (device_is_unmounted(dev)) {
-      Jmsg(jcr, M_WARNING, 0, _("device is BLOCKED due to user unmount.\n"));
+      Jmsg(jcr, M_WARNING, 0, _("device %s is BLOCKED due to user unmount.\n"),
+        dev_name(dev));
    }
    lock_device(dev);
    block_device(dev, BST_DOING_ACQUIRE);
@@ -170,7 +171,8 @@ DEVICE *acquire_device_for_append(JCR *jcr, DEVICE *dev, DEV_BLOCK *block)
    DEVICE *rtn_dev = NULL;
 
    if (device_is_unmounted(dev)) {
-      Jmsg(jcr, M_WARNING, 0, _("device is BLOCKED due to user unmount.\n"));
+      Jmsg(jcr, M_WARNING, 0, _("device %s is BLOCKED due to user unmount.\n"),
+        dev_name(dev));
    }
    lock_device(dev);
    block_device(dev, BST_DOING_ACQUIRE);
@@ -292,7 +294,6 @@ int release_device(JCR *jcr, DEVICE *dev)
       /******FIXME**** send read volume usage statistics to director */
 
    } else if (dev->num_writers > 0) {
-      ASSERT(dev_state(dev, ST_APPEND));
       dev->num_writers--;
       Dmsg1(100, "There are %d writers in release_device\n", dev->num_writers);
       if (dev->num_writers == 0) {
@@ -306,6 +307,7 @@ int release_device(JCR *jcr, DEVICE *dev)
            if (dev_can_write(dev)) {
               weof_dev(dev, 1);
            }
+           dev->VolCatInfo.VolCatFiles = dev->file;   /* set number of files */
            dev->VolCatInfo.VolCatJobs++;              /* increment number of jobs */
            /* Note! do volume update before close, which zaps VolCatInfo */
             Dmsg0(100, "dir_update_vol_info. Release0\n");
@@ -323,6 +325,7 @@ int release_device(JCR *jcr, DEVICE *dev)
               jcr->VolCatInfo.VolCatName, jcr->Job);
         }
          Dmsg0(100, "dir_update_vol_info. Release1\n");
+        dev->VolCatInfo.VolCatFiles = dev->file;   /* set number of files */
         dev->VolCatInfo.VolCatJobs++;              /* increment number of jobs */
         dir_update_volume_info(jcr, dev, 0); /* send Volume info to Director */
       }