Implement block rejection during read

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

diff --git a/bacula/src/stored/protos.h b/bacula/src/stored/protos.h
index 668ad0184e635dffedb60a23137f28af503658a9..107d2d2cc3cf73962744b99b98be0d9e4e289cf7 100644 (file)
--- a/bacula/src/stored/protos.h
+++ b/bacula/src/stored/protos.h
@@ -33,7 +33,11 @@ int   acquire_device_for_read(JCR *jcr, DEVICE *dev, DEV_BLOCK *block);
 int     release_device(JCR *jcr, DEVICE *dev);
 
 /* From askdir.c */
-int    dir_get_volume_info(JCR *jcr, int writing);
+enum get_vol_info_rw {
+   GET_VOL_INFO_FOR_WRITE,
+   GET_VOL_INFO_FOR_READ
+};
+int    dir_get_volume_info(JCR *jcr, enum get_vol_info_rw);
 int    dir_find_next_appendable_volume(JCR *jcr);
 int    dir_update_volume_info(JCR *jcr, VOLUME_CAT_INFO *vol, int relabel);
 int    dir_ask_sysop_to_mount_next_volume(JCR *jcr, DEVICE *dev);
@@ -54,14 +58,17 @@ void        empty_block(DEV_BLOCK *block);
 void   free_block(DEV_BLOCK *block);
 int    write_block_to_device(JCR *jcr, DEVICE *dev, DEV_BLOCK *block);
 int    write_block_to_dev(JCR *jcr, DEVICE *dev, DEV_BLOCK *block);
-int    read_block_from_device(DEVICE *dev, DEV_BLOCK *block);
-int    read_block_from_dev(DEVICE *dev, DEV_BLOCK *block);
+
+#define CHECK_BLOCK_NUMBERS    true
+#define NO_BLOCK_NUMBER_CHECK  false
+int    read_block_from_device(JCR *jcr, DEVICE *dev, DEV_BLOCK *block, bool check_block_numbers);
+int    read_block_from_dev(JCR *jcr, DEVICE *dev, DEV_BLOCK *block, bool check_block_numbers);
 
 /* From butil.c -- utilities for SD tool programs */
 void   print_ls_output(char *fname, char *link, int type, struct stat *statp);
 JCR    *setup_jcr(char *name, char *device, BSR *bsr, char *VolumeName);
 DEVICE *setup_to_access_device(JCR *jcr, int read_access);
-void   display_error_status(DEVICE *dev);
+void   display_tape_error_status(JCR *jcr, DEVICE *dev);
 DEVRES *find_device_res(char *device_name, int read_access);
 
 
@@ -92,6 +99,8 @@ int    bsr_dev(DEVICE *dev, int num);
 void    attach_jcr_to_device(DEVICE *dev, JCR *jcr);
 void    detach_jcr_from_device(DEVICE *dev, JCR *jcr);
 JCR    *next_attached_jcr(DEVICE *dev, JCR *jcr);
+int    dev_can_write(DEVICE *dev);
+int    offline_or_rewind_dev(DEVICE *dev);
 
 
 /* Get info about device */
@@ -109,14 +118,8 @@ void _unlock_device(char *file, int line, DEVICE *dev);
 void _block_device(char *file, int line, DEVICE *dev, int state);
 void _unblock_device(char *file, int line, DEVICE *dev);
 void _steal_device_lock(char *file, int line, DEVICE *dev, bsteal_lock_t *hold, int state);
-void _return_device_lock(char *file, int line, DEVICE *dev, bsteal_lock_t *hold);
-
-/* don't use */
-void _new_lock_device(char *file, int line, DEVICE *dev);
-void _new_lock_device(char *file, int line, DEVICE *dev, int state);
-void _new_unlock_device(char *file, int line, DEVICE *dev);
-void  new_steal_device_lock(DEVICE *dev, brwsteal_t *hold, int state);
-void  new_return_device_lock(DEVICE *dev, brwsteal_t *hold);
+void _give_back_device_lock(char *file, int line, DEVICE *dev, bsteal_lock_t *hold);
+void set_new_volume_parameters(JCR *jcr, DEVICE *dev);
 
 /* From dircmd.c */
 void    *connection_request(void *arg); 
@@ -145,10 +148,13 @@ int        unser_session_label(SESSION_LABEL *label, DEV_RECORD *rec);
 /* From match_bsr.c */
 int match_bsr(BSR *bsr, DEV_RECORD *rec, VOLUME_LABEL *volrec, 
              SESSION_LABEL *sesrec);
+int match_bsr_block(BSR *bsr, DEV_BLOCK *block);
+void position_bsr_block(BSR *bsr, DEV_BLOCK *block);
 
 /* From mount.c */
 int     mount_next_write_volume(JCR *jcr, DEVICE *dev, DEV_BLOCK *block, int release);
 int     mount_next_read_volume(JCR *jcr, DEVICE *dev, DEV_BLOCK *block);
+void    release_volume(JCR *jcr, DEVICE *dev);
 
 /* From autochanger.c */
 int     autoload_device(JCR *jcr, DEVICE *dev, int writing, BSOCK *dir);