Use part_size and not max_part_size when setting write timeout.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@2442 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/nb-1.37 b/bacula/nb-1.37
index 278caa62ce19f727478d860045dba2e118e074f3..2d01f9d4f2ef22492fca1dc3ef93f8034b8168ce 100644 (file)
--- a/bacula/nb-1.37
+++ b/bacula/nb-1.37
@@ -5,6 +5,7 @@ General:
 
 Changes to 1.37.*:
 14Oct05
+ - dvd.c:dvd_write_part: Use part_size and not max_part_size when setting write timeout.
  - dvd.c:do_mount_dev: When checking if the DVD is mounted, do not count ., .. and .keep (needed on Gentoo).
 15Aug05
  - Convert dvd-writepart to Python.

diff --git a/bacula/src/stored/dvd.c b/bacula/src/stored/dvd.c
index 9e62acfe9164975735eb367bfee22ad82d8c61e8..dfd20b751a08f78fcb56f5ad8ff11270b4376ec5 100644 (file)
--- a/bacula/src/stored/dvd.c
+++ b/bacula/src/stored/dvd.c
@@ -323,8 +323,10 @@ bool dvd_write_part(DCR *dcr)
     * timeout = dev->max_open_wait + (dev->max_part_size/(1350*1024/2));
     * I modified this for a longer timeout; pre-formatting, blanking and
     * writing can take quite a while
+    *
+    * NB: Use part_size and not max_part_size, needed when you don't set max part size (so it defaults to 0)
     */
-   timeout = dev->max_open_wait + (dev->max_part_size/(1350*1024)*8);
+   timeout = dev->max_open_wait + (dev->part_size/(1350*1024)*8);
 
    Dmsg2(29, "dvd_write_part: cmd=%s timeout=%d\n", ocmd.c_str(), timeout);