Update doc, default working directory bscan

[bacula/bacula] / bacula / src / stored / block.h

diff --git a/bacula/src/stored/block.h b/bacula/src/stored/block.h
index ca265dea7c41f642784abd05ac25ecf5e7206dd3..bb9e72a9d964d4aa4397e4dfda4d0083beab00e1 100644 (file)
--- a/bacula/src/stored/block.h
+++ b/bacula/src/stored/block.h
@@ -41,18 +41,19 @@
 #define BLKHDR1_LENGTH   16             /* Total length */
 #define BLKHDR2_LENGTH   24             /* Total length */
 
-#define WRITE_BLKHDR_ID     BLKHDR1_ID
-#define WRITE_BLKHDR_LENGTH BLKHDR1_LENGTH
-#define BLOCK_VER               1
+#define WRITE_BLKHDR_ID     BLKHDR2_ID
+#define WRITE_BLKHDR_LENGTH BLKHDR2_LENGTH
+#define BLOCK_VER               2
 
 /* Record header definitions */
 #define RECHDR1_LENGTH      20
 #define RECHDR2_LENGTH      12
-#define WRITE_RECHDR_LENGTH RECHDR1_LENGTH
+#define WRITE_RECHDR_LENGTH RECHDR2_LENGTH
 
 /* Tape label and version definitions */
-#define BaculaId "Bacula 0.9 mortal\n"
-#define BaculaTapeVersion 10
+#define BaculaId    "Bacula 1.0 immortal\n"
+#define OldBaculaId "Bacula 0.9 mortal\n"
+#define BaculaTapeVersion 11
 #define OldCompatibleBaculaTapeVersion1  10
 #define OldCompatibleBaculaTapeVersion2   9
 
@@ -83,6 +84,7 @@
  */
 typedef struct s_dev_block {
    struct s_dev_block *next;          /* pointer to next one */
+   void *dev;                         /* pointer to device (DEVICE not defined yet) */
    /* binbuf is the number of bytes remaining
     * in the buffer. For writes, it is bytes not yet written.
     * For reads, it is remaining bytes not yet read.