Fix for reused thread ids by FreeBSD + qfill command

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

diff --git a/bacula/src/stored/mount.c b/bacula/src/stored/mount.c
index 1ebf5ed269564f1fd9c24c715d9a6251a539fcea..f47f53c347c3671db4657cb2c5b14e1c9e085f3b 100644 (file)
--- a/bacula/src/stored/mount.c
+++ b/bacula/src/stored/mount.c
@@ -75,30 +75,13 @@ mount_next_vol:
       jcr->VolumeName[0] = 0;
 
       if (!dev_is_tape(dev) || !dev_cap(dev, CAP_ALWAYSOPEN)) {
-        if (dev_cap(dev, CAP_OFFLINEUNMOUNT)) {
-           offline_dev(dev);
-        /*            
-          * Note, this rewind probably should not be here (it wasn't
-         *  in prior versions of Bacula), but on FreeBSD, this is
-          *  needed in the case the tape was "frozen" due to an error
-         *  such as backspacing after writing and EOF. If it is not
-         *  done, all future references to the drive get and I/O error.
-         */
-        } else if (!rewind_dev(dev)) {
-            Jmsg2(jcr, M_WARNING, 0, _("Rewind error on device %s. ERR=%s\n"), 
-                 dev_name(dev), strerror_dev(dev));
-        }
+        offline_or_rewind_dev(dev);
         close_dev(dev);
       }
 
       /* If we have not closed the device, then at least rewind the tape */
       if (dev->state & ST_OPENED) {
-        if (dev_cap(dev, CAP_OFFLINEUNMOUNT)) {
-           offline_dev(dev);
-        } else if (!rewind_dev(dev)) {
-            Jmsg2(jcr, M_WARNING, 0, _("Rewind error on device %s. ERR=%s\n"), 
-                 dev_name(dev), strerror_dev(dev));
-        }
+        offline_or_rewind_dev(dev);
       }
       ask = 1;                       /* ask operator to mount tape */
    }