X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fstored%2Fdev.c;h=0e72db6a84530de7182b80d605238ad46ff934b3;hb=ce462cd94d90f4785b622cedc2ca48d616fe3f07;hp=47d8e6741f12f3488d3782a502d94367afe961eb;hpb=48502728cb3358a557edc027e7213e7c1158964e;p=bacula%2Fbacula diff --git a/bacula/src/stored/dev.c b/bacula/src/stored/dev.c index 47d8e6741f..0e72db6a84 100644 --- a/bacula/src/stored/dev.c +++ b/bacula/src/stored/dev.c @@ -1,44 +1,14 @@ -/* - * - * dev.c -- low level operations on device (storage device) - * - * Kern Sibbald, MM - * - * NOTE!!!! None of these routines are reentrant. You must - * use lock_device() and unlock_device() at a higher level, - * or use the xxx_device() equivalents. By moving the - * thread synchronization to a higher level, we permit - * the higher level routines to "seize" the device and - * to carry out operations without worrying about who - * set what lock (i.e. race conditions). - * - * Note, this is the device dependent code, and may have - * to be modified for each system, but is meant to - * be as "generic" as possible. - * - * The purpose of this code is to develop a SIMPLE Storage - * daemon. More complicated coding (double buffering, writer - * thread, ...) is left for a later version. - * - * Unfortunately, I have had to add more and more complication - * to this code. This was not foreseen as noted above, and as - * a consequence has lead to something more contorted than is - * really necessary -- KES. Note, this contortion has been - * corrected to a large extent by a rewrite (Apr MMI). - * - * Version $Id$ - */ /* Bacula® - The Network Backup Solution - Copyright (C) 2000-2007 Free Software Foundation Europe e.V. + Copyright (C) 2000-2008 Free Software Foundation Europe e.V. The main author of Bacula is Kern Sibbald, with contributions from many others, a complete list can be found in the file AUTHORS. This program is Free Software; you can redistribute it and/or modify it under the terms of version two of the GNU General Public - License as published by the Free Software Foundation plus additions - that are listed in the file LICENSE. + License as published by the Free Software Foundation and included + in the file LICENSE. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -55,6 +25,30 @@ (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich, Switzerland, email:ftf@fsfeurope.org. */ +/* + * + * dev.c -- low level operations on device (storage device) + * + * Kern Sibbald, MM + * + * NOTE!!!! None of these routines are reentrant. You must + * use dev->r_dlock() and dev->unlock() at a higher level, + * or use the xxx_device() equivalents. By moving the + * thread synchronization to a higher level, we permit + * the higher level routines to "seize" the device and + * to carry out operations without worrying about who + * set what lock (i.e. race conditions). + * + * Note, this is the device dependent code, and may have + * to be modified for each system, but is meant to + * be as "generic" as possible. + * + * The purpose of this code is to develop a SIMPLE Storage + * daemon. More complicated coding (double buffering, writer + * thread, ...) is left for a later version. + * + * Version $Id$ + */ /* * Handling I/O errors and end of tape conditions are a bit tricky. @@ -95,7 +89,7 @@ /* Forward referenced functions */ void set_os_device_parameters(DCR *dcr); static bool dev_get_os_pos(DEVICE *dev, struct mtget *mt_stat); -static char *mode_to_str(int mode); +static const char *mode_to_str(int mode); /* * Allocate and initialize the DEVICE structure @@ -115,6 +109,7 @@ init_dev(JCR *jcr, DEVRES *device) int errstat; DCR *dcr = NULL; DEVICE *dev; + uint32_t max_bs; /* If no device type specified, try to guess */ @@ -123,7 +118,7 @@ init_dev(JCR *jcr, DEVRES *device) if (stat(device->device_name, &statp) < 0) { berrno be; Jmsg2(jcr, M_ERROR, 0, _("Unable to stat device %s: ERR=%s\n"), - device->device_name, be.strerror()); + device->device_name, be.bstrerror()); return NULL; } if (S_ISDIR(statp.st_mode)) { @@ -132,6 +127,13 @@ init_dev(JCR *jcr, DEVRES *device) device->dev_type = B_TAPE_DEV; } else if (S_ISFIFO(statp.st_mode)) { device->dev_type = B_FIFO_DEV; +#ifdef USE_VTAPE + /* must set DeviceType = Vtape + * in normal mode, autodetection is disabled + */ + } else if (S_ISREG(statp.st_mode)) { + device->dev_type = B_VTAPE_DEV; +#endif } else if (!(device->cap_bits & CAP_REQMOUNT)) { Jmsg2(jcr, M_ERROR, 0, _("%s is an unknown device type. Must be tape or directory\n" " or have RequiresMount=yes for DVD. st_mode=%x\n"), @@ -144,7 +146,7 @@ init_dev(JCR *jcr, DEVRES *device) dev = (DEVICE *)malloc(sizeof(DEVICE)); memset(dev, 0, sizeof(DEVICE)); - dev->Slot = -1; /* unknown */ + dev->clear_slot(); /* unknown */ /* Copy user supplied device parameters from Resource */ dev->dev_name = get_memory(strlen(device->device_name)+1); @@ -167,6 +169,7 @@ init_dev(JCR *jcr, DEVRES *device) dev->drive_index = device->drive_index; dev->autoselect = device->autoselect; dev->dev_type = device->dev_type; + dev->init_backend(); if (dev->is_tape()) { /* No parts on tapes */ dev->max_part_size = 0; } else { @@ -193,7 +196,7 @@ init_dev(JCR *jcr, DEVRES *device) berrno be; dev->dev_errno = errno; Jmsg2(jcr, M_ERROR_TERM, 0, _("Unable to stat mount point %s: ERR=%s\n"), - device->mount_point, be.strerror()); + device->mount_point, be.bstrerror()); } } if (dev->is_dvd()) { @@ -205,7 +208,17 @@ init_dev(JCR *jcr, DEVRES *device) } } - if (dev->max_block_size > 1000000) { + /* Sanity check */ + if (dev->max_block_size == 0) { + max_bs = DEFAULT_BLOCK_SIZE; + } else { + max_bs = dev->max_block_size; + } + if (dev->min_block_size > max_bs) { + Jmsg(jcr, M_ERROR_TERM, 0, _("Min block size > max on device %s\n"), + dev->print_name()); + } + if (dev->max_block_size > 4096000) { Jmsg3(jcr, M_ERROR, 0, _("Block size %u on device %s is too large, using default %u\n"), dev->max_block_size, dev->print_name(), DEFAULT_BLOCK_SIZE); dev->max_block_size = 0; @@ -221,43 +234,82 @@ init_dev(JCR *jcr, DEVRES *device) if ((errstat = pthread_mutex_init(&dev->m_mutex, NULL)) != 0) { berrno be; dev->dev_errno = errstat; - Mmsg1(dev->errmsg, _("Unable to init mutex: ERR=%s\n"), be.strerror(errstat)); + Mmsg1(dev->errmsg, _("Unable to init mutex: ERR=%s\n"), be.bstrerror(errstat)); Jmsg0(jcr, M_ERROR_TERM, 0, dev->errmsg); } if ((errstat = pthread_cond_init(&dev->wait, NULL)) != 0) { berrno be; dev->dev_errno = errstat; - Mmsg1(dev->errmsg, _("Unable to init cond variable: ERR=%s\n"), be.strerror(errstat)); + Mmsg1(dev->errmsg, _("Unable to init cond variable: ERR=%s\n"), be.bstrerror(errstat)); Jmsg0(jcr, M_ERROR_TERM, 0, dev->errmsg); } if ((errstat = pthread_cond_init(&dev->wait_next_vol, NULL)) != 0) { berrno be; dev->dev_errno = errstat; - Mmsg1(dev->errmsg, _("Unable to init cond variable: ERR=%s\n"), be.strerror(errstat)); + Mmsg1(dev->errmsg, _("Unable to init cond variable: ERR=%s\n"), be.bstrerror(errstat)); Jmsg0(jcr, M_ERROR_TERM, 0, dev->errmsg); } if ((errstat = pthread_mutex_init(&dev->spool_mutex, NULL)) != 0) { berrno be; dev->dev_errno = errstat; - Mmsg1(dev->errmsg, _("Unable to init mutex: ERR=%s\n"), be.strerror(errstat)); + Mmsg1(dev->errmsg, _("Unable to init mutex: ERR=%s\n"), be.bstrerror(errstat)); Jmsg0(jcr, M_ERROR_TERM, 0, dev->errmsg); } #ifdef xxx if ((errstat = rwl_init(&dev->lock)) != 0) { berrno be; dev->dev_errno = errstat; - Mmsg1(dev->errmsg, _("Unable to init mutex: ERR=%s\n"), be.strerror(errstat)); + Mmsg1(dev->errmsg, _("Unable to init mutex: ERR=%s\n"), be.bstrerror(errstat)); Jmsg0(jcr, M_ERROR_TERM, 0, dev->errmsg); } #endif dev->clear_opened(); dev->attached_dcrs = New(dlist(dcr, &dcr->dev_link)); - Dmsg2(29, "init_dev: tape=%d dev_name=%s\n", dev->is_tape(), dev->dev_name); + Dmsg2(100, "init_dev: tape=%d dev_name=%s\n", dev->is_tape(), dev->dev_name); + dev->initiated = true; return dev; } +/* Choose the right backend */ +void DEVICE::init_backend() +{ + +#ifdef HAVE_WIN32 + if (is_tape()) { + d_open = win32_tape_open; + d_write = win32_tape_write; + d_close = win32_tape_close; + d_ioctl = win32_tape_ioctl; + d_read = win32_tape_read; + + } else { + d_open = ::open; + d_close = ::close; + d_ioctl = win32_ioctl; /* dummy function */ + d_write = win32_write; /* win32 read/write are not POSIX */ + d_read = win32_read; + } + +#else /* POSIX / UNIX Interface */ + if (is_vtape()) { /* test backend */ + d_open = vtape_open; /* vtape isn't available for WIN32 or FreeBSD */ + d_write = vtape_write; + d_close = vtape_close; + d_ioctl = vtape_ioctl; + d_read = vtape_read; + + } else { /* tape and file are using normal io */ + d_open = ::open; + d_write = ::write; + d_close = ::close; + d_ioctl = ::ioctl; + d_read = ::read; + } +#endif +} + /* * Open the device with the operating system and * initialize buffer pointers. @@ -279,11 +331,7 @@ DEVICE::open(DCR *dcr, int omode) if (openmode == omode) { return m_fd; } else { - if (is_tape()) { - tape_close(m_fd); - } else { - ::close(m_fd); - } + d_close(m_fd); clear_opened(); Dmsg0(100, "Close fd for mode change.\n"); preserve = state & (ST_LABEL|ST_APPEND|ST_READ); @@ -293,10 +341,9 @@ DEVICE::open(DCR *dcr, int omode) bstrncpy(VolCatInfo.VolCatName, dcr->VolumeName, sizeof(VolCatInfo.VolCatName)); } - Dmsg4(29, "open dev: type=%d dev_name=%s vol=%s mode=%s\n", dev_type, + Dmsg4(100, "open dev: type=%d dev_name=%s vol=%s mode=%s\n", dev_type, print_name(), VolCatInfo.VolCatName, mode_to_str(omode)); state &= ~(ST_LABEL|ST_APPEND|ST_READ|ST_EOT|ST_WEOT|ST_EOF); - Slot = -1; /* unknown slot */ label_type = B_BACULA_LABEL; if (is_tape() || is_fifo()) { open_tape_device(dcr, omode); @@ -344,7 +391,7 @@ void DEVICE::open_tape_device(DCR *dcr, int omode) #endif - Dmsg0(29, "Open dev: device is tape\n"); + Dmsg0(100, "Open dev: device is tape\n"); get_autochanger_loaded_slot(dcr); @@ -357,13 +404,13 @@ void DEVICE::open_tape_device(DCR *dcr, int omode) errno = 0; if (is_fifo() && timeout) { /* Set open timer */ - tid = start_thread_timer(pthread_self(), timeout); + tid = start_thread_timer(dcr->jcr, pthread_self(), timeout); } Dmsg2(100, "Try open %s mode=%s\n", print_name(), mode_to_str(omode)); #if defined(HAVE_WIN32) /* Windows Code */ - if ((m_fd = tape_open(dev_name, mode)) < 0) { + if ((m_fd = d_open(dev_name, mode)) < 0) { dev_errno = errno; } @@ -373,38 +420,38 @@ void DEVICE::open_tape_device(DCR *dcr, int omode) /* If busy retry each second for max_open_wait seconds */ for ( ;; ) { /* Try non-blocking open */ - m_fd = ::open(dev_name, mode+O_NONBLOCK); + m_fd = d_open(dev_name, mode+O_NONBLOCK); if (m_fd < 0) { berrno be; dev_errno = errno; - Dmsg5(050, "Open error on %s omode=%d mode=%x errno=%d: ERR=%s\n", - print_name(), omode, mode, errno, be.strerror()); + Dmsg5(100, "Open error on %s omode=%d mode=%x errno=%d: ERR=%s\n", + print_name(), omode, mode, errno, be.bstrerror()); } else { /* Tape open, now rewind it */ - Dmsg0(050, "Rewind after open\n"); + Dmsg0(100, "Rewind after open\n"); mt_com.mt_op = MTREW; mt_com.mt_count = 1; /* rewind only if dev is a tape */ - if (is_tape() && (ioctl(m_fd, MTIOCTOP, (char *)&mt_com) < 0)) { + if (is_tape() && (d_ioctl(m_fd, MTIOCTOP, (char *)&mt_com) < 0)) { berrno be; dev_errno = errno; /* set error status from rewind */ - ::close(m_fd); + d_close(m_fd); clear_opened(); Dmsg2(100, "Rewind error on %s close: ERR=%s\n", print_name(), - be.strerror(dev_errno)); + be.bstrerror(dev_errno)); /* If we get busy, device is probably rewinding, try again */ if (dev_errno != EBUSY) { break; /* error -- no medium */ } } else { /* Got fd and rewind worked, so we must have medium in drive */ - ::close(m_fd); - m_fd = ::open(dev_name, mode); /* open normally */ + d_close(m_fd); + m_fd = d_open(dev_name, mode); /* open normally */ if (m_fd < 0) { berrno be; dev_errno = errno; - Dmsg5(050, "Open error on %s omode=%d mode=%x errno=%d: ERR=%s\n", - print_name(), omode, mode, errno, be.strerror()); + Dmsg5(100, "Open error on %s omode=%d mode=%x errno=%d: ERR=%s\n", + print_name(), omode, mode, errno, be.bstrerror()); break; } dev_errno = 0; @@ -424,7 +471,7 @@ void DEVICE::open_tape_device(DCR *dcr, int omode) if (!is_open()) { berrno be; Mmsg2(errmsg, _("Unable to open device %s: ERR=%s\n"), - print_name(), be.strerror(dev_errno)); + print_name(), be.bstrerror(dev_errno)); Dmsg1(100, "%s", errmsg); } @@ -433,7 +480,7 @@ void DEVICE::open_tape_device(DCR *dcr, int omode) stop_thread_timer(tid); tid = 0; } - Dmsg1(29, "open dev: tape %d opened\n", m_fd); + Dmsg1(100, "open dev: tape %d opened\n", m_fd); } @@ -475,22 +522,22 @@ void DEVICE::open_file_device(DCR *dcr, int omode) openmode = omode; set_mode(omode); /* If creating file, give 0640 permissions */ - Dmsg3(29, "open disk: mode=%s open(%s, 0x%x, 0640)\n", mode_to_str(omode), + Dmsg3(100, "open disk: mode=%s open(%s, 0x%x, 0640)\n", mode_to_str(omode), archive_name.c_str(), mode); /* Use system open() */ if ((m_fd = ::open(archive_name.c_str(), mode, 0640)) < 0) { berrno be; dev_errno = errno; Mmsg2(errmsg, _("Could not open: %s, ERR=%s\n"), archive_name.c_str(), - be.strerror()); - Dmsg1(29, "open failed: %s", errmsg); - Emsg0(M_FATAL, 0, errmsg); + be.bstrerror()); + Dmsg1(100, "open failed: %s", errmsg); + Jmsg1(NULL, M_WARNING, 0, "%s", errmsg); } else { dev_errno = 0; file = 0; file_addr = 0; } - Dmsg4(29, "open dev: disk fd=%d opened, part=%d/%d, part_size=%u\n", + Dmsg4(100, "open dev: disk fd=%d opened, part=%d/%d, part_size=%u\n", m_fd, part, num_dvd_parts, part_size); } @@ -508,7 +555,7 @@ void DEVICE::open_dvd_device(DCR *dcr, int omode) /* * Handle opening of DVD Volume */ - Dmsg2(29, "Enter: open_dvd_dev: DVD vol=%s mode=%s\n", + Dmsg2(100, "Enter: open_dvd_dev: DVD vol=%s mode=%s\n", &dcr->VolCatInfo, mode_to_str(omode)); /* @@ -545,7 +592,7 @@ void DEVICE::open_dvd_device(DCR *dcr, int omode) * If we are not trying to access the last part, set mode to * OPEN_READ_ONLY as writing would be an error. */ - Dmsg2(29, "open DVD part=%d num_dvd_parts=%d\n", part, num_dvd_parts); + Dmsg2(100, "open DVD part=%d num_dvd_parts=%d\n", part, num_dvd_parts); /* Now find the name of the part that we want to access */ if (part <= num_dvd_parts) { omode = OPEN_READ_ONLY; @@ -596,7 +643,7 @@ void DEVICE::open_dvd_device(DCR *dcr, int omode) if (stat(part1_name.c_str(), &statp) < 0) { berrno be; Mmsg(errmsg, _("Unable to stat DVD part 1 file %s: ERR=%s\n"), - part1_name.c_str(), be.strerror()); + part1_name.c_str(), be.bstrerror()); Emsg0(M_FATAL, 0, errmsg); clear_opened(); return; @@ -621,7 +668,7 @@ void DEVICE::open_dvd_device(DCR *dcr, int omode) return; } if (have_media()) { - Dmsg1(29, "Could not mount device %s, this is not a problem (num_dvd_parts == 0), and have media.\n", print_name()); + Dmsg1(100, "Could not mount device %s, this is not a problem (num_dvd_parts == 0), and have media.\n", print_name()); } else { Mmsg(errmsg, _("There is no valid DVD in device %s.\n"), print_name()); Emsg0(M_FATAL, 0, errmsg); @@ -636,7 +683,7 @@ void DEVICE::open_dvd_device(DCR *dcr, int omode) } } - Dmsg5(29, "open dev: DVD dev=%s mode=%s part=%d npart=%d volcatnparts=%d\n", + Dmsg5(100, "open dev: DVD dev=%s mode=%s part=%d npart=%d volcatnparts=%d\n", archive_name.c_str(), mode_to_str(omode), part, num_dvd_parts, dcr->VolCatInfo.VolCatParts); openmode = omode; @@ -644,16 +691,16 @@ void DEVICE::open_dvd_device(DCR *dcr, int omode) /* If creating file, give 0640 permissions */ - Dmsg3(29, "mode=%s open(%s, 0x%x, 0640)\n", mode_to_str(omode), + Dmsg3(100, "mode=%s open(%s, 0x%x, 0640)\n", mode_to_str(omode), archive_name.c_str(), mode); /* Use system open() */ if ((m_fd = ::open(archive_name.c_str(), mode, 0640)) < 0) { berrno be; Mmsg2(errmsg, _("Could not open: %s, ERR=%s\n"), archive_name.c_str(), - be.strerror()); + be.bstrerror()); // Should this be set if we try the create/open below dev_errno = EIO; /* Interpreted as no device present by acquire.c:acquire_device_for_read(). */ - Dmsg1(29, "open failed: %s", errmsg); + Dmsg1(100, "open failed: %s", errmsg); /* Previous open failed. See if we can recover */ if ((omode == OPEN_READ_ONLY || omode == OPEN_READ_WRITE) && @@ -663,7 +710,7 @@ void DEVICE::open_dvd_device(DCR *dcr, int omode) * level software thinks that we are extending a pre-existing * media. Reads for READ_ONLY will report immediately an EOF * Sometimes it is better to finish with an EOF than with an error. */ - Dmsg1(29, "Creating last part on spool: %s\n", archive_name.c_str()); + Dmsg1(100, "Creating last part on spool: %s\n", archive_name.c_str()); omode = CREATE_READ_WRITE; set_mode(CREATE_READ_WRITE); m_fd = ::open(archive_name.c_str(), mode, 0640); @@ -680,10 +727,10 @@ void DEVICE::open_dvd_device(DCR *dcr, int omode) berrno be; dev_errno = errno; Mmsg2(errmsg, _("Could not fstat: %s, ERR=%s\n"), archive_name.c_str(), - be.strerror()); - Dmsg1(29, "open failed: %s", errmsg); + be.bstrerror()); + Dmsg1(100, "open failed: %s", errmsg); /* Use system close() */ - ::close(m_fd); + d_close(m_fd); clear_opened(); } else { part_size = filestat.st_size; @@ -705,7 +752,7 @@ bool DEVICE::rewind(DCR *dcr) unsigned int i; bool first = true; - Dmsg3(400, "rewind res=%d fd=%d %s\n", reserved_device, m_fd, print_name()); + Dmsg3(400, "rewind res=%d fd=%d %s\n", num_reserved(), m_fd, print_name()); state &= ~(ST_EOT|ST_EOF|ST_WEOT); /* remove EOF/EOT flags */ block_num = file = 0; file_size = 0; @@ -727,11 +774,11 @@ bool DEVICE::rewind(DCR *dcr) * retrying every 5 seconds. */ for (i=max_rewind_wait; ; i -= 5) { - if (tape_ioctl(m_fd, MTIOCTOP, (char *)&mt_com) < 0) { + if (d_ioctl(m_fd, MTIOCTOP, (char *)&mt_com) < 0) { berrno be; clrerror(MTREW); if (i == max_rewind_wait) { - Dmsg1(200, "Rewind error, %s. retrying ...\n", be.strerror()); + Dmsg1(200, "Rewind error, %s. retrying ...\n", be.bstrerror()); } /* * This is a gross hack, because if the user has the @@ -741,7 +788,7 @@ bool DEVICE::rewind(DCR *dcr) */ if (first && dcr) { int open_mode = openmode; - tape_close(m_fd); + d_close(m_fd); clear_opened(); open(dcr, open_mode); if (m_fd < 0) { @@ -763,7 +810,7 @@ bool DEVICE::rewind(DCR *dcr) } #endif Mmsg2(errmsg, _("Rewind error on %s. ERR=%s.\n"), - print_name(), be.strerror()); + print_name(), be.bstrerror()); return false; } break; @@ -773,48 +820,13 @@ bool DEVICE::rewind(DCR *dcr) berrno be; dev_errno = errno; Mmsg2(errmsg, _("lseek error on %s. ERR=%s.\n"), - print_name(), be.strerror()); + print_name(), be.bstrerror()); return false; } } return true; } -void DEVICE::block(int why) -{ - lock_device(this); - block_device(this, why); - unlock(); -} - -void DEVICE::unblock() -{ - lock(); - unblock_device(this); - unlock(); -} - -const char *DEVICE::print_blocked() const -{ - switch (m_blocked) { - case BST_NOT_BLOCKED: - return "BST_NOT_BLOCKED"; - case BST_UNMOUNTED: - return "BST_UNMOUNTED"; - case BST_WAITING_FOR_SYSOP: - return "BST_WAITING_FOR_SYSOP"; - case BST_DOING_ACQUIRE: - return "BST_DOING_ACQUIRE"; - case BST_WRITING_LABEL: - return "BST_WRITING_LABEL"; - case BST_UNMOUNTED_WAITING_FOR_SYSOP: - return "BST_UNMOUNTED_WAITING_FOR_SYSOP"; - case BST_MOUNT: - return "BST_MOUNT"; - default: - return _("unknown blocked code"); - } -} /* * Called to indicate that we have just read an @@ -850,9 +862,9 @@ void DEVICE::set_ateot() bool DEVICE::eod(DCR *dcr) { struct mtop mt_com; - struct mtget mt_stat; bool ok = true; boffset_t pos; + int32_t os_file; if (m_fd < 0) { dev_errno = EBADF; @@ -864,7 +876,7 @@ bool DEVICE::eod(DCR *dcr) return fsf(VolCatInfo.VolCatFiles); #endif - Dmsg0(29, "eod\n"); + Dmsg0(100, "eod\n"); if (at_eot()) { return true; } @@ -872,7 +884,7 @@ bool DEVICE::eod(DCR *dcr) block_num = file = 0; file_size = 0; file_addr = 0; - if (is_fifo() || is_prog()) { + if (is_fifo()) { return true; } if (!is_tape()) { @@ -886,14 +898,14 @@ bool DEVICE::eod(DCR *dcr) dev_errno = errno; berrno be; Mmsg2(errmsg, _("lseek error on %s. ERR=%s.\n"), - print_name(), be.strerror()); + print_name(), be.bstrerror()); return false; } #ifdef MTEOM if (has_cap(CAP_FASTFSF) && !has_cap(CAP_EOM)) { Dmsg0(100,"Using FAST FSF for EOM\n"); /* If unknown position, rewind */ - if (!dev_get_os_pos(this, &mt_stat)) { + if (get_os_tape_file() < 0) { if (!rewind(NULL)) { return false; } @@ -916,26 +928,27 @@ bool DEVICE::eod(DCR *dcr) mt_com.mt_count = 1; } - if (tape_ioctl(m_fd, MTIOCTOP, (char *)&mt_com) < 0) { + if (d_ioctl(m_fd, MTIOCTOP, (char *)&mt_com) < 0) { berrno be; clrerror(mt_com.mt_op); - Dmsg1(50, "ioctl error: %s\n", be.strerror()); + Dmsg1(50, "ioctl error: %s\n", be.bstrerror()); update_pos(dcr); Mmsg2(errmsg, _("ioctl MTEOM error on %s. ERR=%s.\n"), - print_name(), be.strerror()); + print_name(), be.bstrerror()); return false; } - if (!dev_get_os_pos(this, &mt_stat)) { + os_file = get_os_tape_file(); + if (os_file < 0) { berrno be; clrerror(-1); Mmsg2(errmsg, _("ioctl MTIOCGET error on %s. ERR=%s.\n"), - print_name(), be.strerror()); + print_name(), be.bstrerror()); return false; } - Dmsg2(100, "EOD file=%d block=%d\n", mt_stat.mt_fileno, mt_stat.mt_blkno); + Dmsg1(100, "EOD file=%d\n", os_file); set_ateof(); - file = mt_stat.mt_fileno; + file = os_file; } else { #else { @@ -960,12 +973,12 @@ bool DEVICE::eod(DCR *dcr) * Avoid infinite loop by ensuring we advance. */ if (!at_eot() && file_num == (int)file) { - struct mtget mt_stat; Dmsg1(100, "fsf did not advance from file %d\n", file_num); set_ateof(); - if (dev_get_os_pos(this, &mt_stat)) { - Dmsg2(100, "Adjust file from %d to %d\n", file_num, mt_stat.mt_fileno); - file = mt_stat.mt_fileno; + os_file = get_os_tape_file(); + if (os_file >= 0) { + Dmsg2(100, "Adjust file from %d to %d\n", file_num, os_file); + file = os_file; } break; } @@ -977,13 +990,13 @@ bool DEVICE::eod(DCR *dcr) * the second EOF. */ if (has_cap(CAP_BSFATEOM)) { - struct mtget mt_stat; /* Backup over EOF */ ok = bsf(1); /* If BSF worked and fileno is known (not -1), set file */ - if (dev_get_os_pos(this, &mt_stat)) { - Dmsg2(100, "BSFATEOF adjust file from %d to %d\n", file , mt_stat.mt_fileno); - file = mt_stat.mt_fileno; + os_file = get_os_tape_file(); + if (os_file >= 0) { + Dmsg2(100, "BSFATEOF adjust file from %d to %d\n", file , os_file); + file = os_file; } else { file++; /* wing it -- not correct on all OSes */ } @@ -1020,9 +1033,9 @@ bool DEVICE::update_pos(DCR *dcr) if (pos < 0) { berrno be; dev_errno = errno; - Pmsg1(000, _("Seek error: ERR=%s\n"), be.strerror()); + Pmsg1(000, _("Seek error: ERR=%s\n"), be.bstrerror()); Mmsg2(errmsg, _("lseek error on %s. ERR=%s.\n"), - print_name(), be.strerror()); + print_name(), be.bstrerror()); ok = false; } else { file_addr = pos; @@ -1059,11 +1072,11 @@ uint32_t status_dev(DEVICE *dev) stat |= BMT_TAPE; Pmsg0(-20,_(" Bacula status:")); Pmsg2(-20,_(" file=%d block=%d\n"), dev->file, dev->block_num); - if (tape_ioctl(dev->fd(), MTIOCGET, (char *)&mt_stat) < 0) { + if (dev->d_ioctl(dev->fd(), MTIOCGET, (char *)&mt_stat) < 0) { berrno be; dev->dev_errno = errno; Mmsg2(dev->errmsg, _("ioctl MTIOCGET error on %s. ERR=%s.\n"), - dev->print_name(), be.strerror()); + dev->print_name(), be.bstrerror()); return 0; } Pmsg0(-20, _(" Device status:")); @@ -1177,7 +1190,7 @@ bool load_dev(DEVICE *dev) berrno be; dev->dev_errno = ENOTTY; /* function not available */ Mmsg2(dev->errmsg, _("ioctl MTLOAD error on %s. ERR=%s.\n"), - dev->print_name(), be.strerror()); + dev->print_name(), be.bstrerror()); return false; #else @@ -1186,11 +1199,11 @@ bool load_dev(DEVICE *dev) dev->file_addr = 0; mt_com.mt_op = MTLOAD; mt_com.mt_count = 1; - if (tape_ioctl(dev->fd(), MTIOCTOP, (char *)&mt_com) < 0) { + if (dev->d_ioctl(dev->fd(), MTIOCTOP, (char *)&mt_com) < 0) { berrno be; dev->dev_errno = errno; Mmsg2(dev->errmsg, _("ioctl MTLOAD error on %s. ERR=%s.\n"), - dev->print_name(), be.strerror()); + dev->print_name(), be.bstrerror()); return false; } return true; @@ -1217,11 +1230,11 @@ bool DEVICE::offline() unlock_door(); mt_com.mt_op = MTOFFL; mt_com.mt_count = 1; - if (tape_ioctl(m_fd, MTIOCTOP, (char *)&mt_com) < 0) { + if (d_ioctl(m_fd, MTIOCTOP, (char *)&mt_com) < 0) { berrno be; dev_errno = errno; Mmsg2(errmsg, _("ioctl MTOFFL error on %s. ERR=%s.\n"), - print_name(), be.strerror()); + print_name(), be.bstrerror()); return false; } Dmsg1(100, "Offlined device %s\n", print_name()); @@ -1255,7 +1268,7 @@ bool DEVICE::offline_or_rewind() */ bool DEVICE::fsf(int num) { - struct mtget mt_stat; + int32_t os_file = 0; struct mtop mt_com; int stat = 0; @@ -1289,22 +1302,29 @@ bool DEVICE::fsf(int num) * forward space past the end of the medium. */ if (has_cap(CAP_FSF) && has_cap(CAP_MTIOCGET) && has_cap(CAP_FASTFSF)) { + int my_errno = 0; mt_com.mt_op = MTFSF; mt_com.mt_count = num; - stat = tape_ioctl(m_fd, MTIOCTOP, (char *)&mt_com); - if (stat < 0 || !dev_get_os_pos(this, &mt_stat)) { + stat = d_ioctl(m_fd, MTIOCTOP, (char *)&mt_com); + if (stat < 0) { + my_errno = errno; /* save errno */ + } else if ((os_file=get_os_tape_file()) < 0) { + my_errno = errno; /* save errno */ + } + if (my_errno != 0) { berrno be; set_eot(); Dmsg0(200, "Set ST_EOT\n"); clrerror(MTFSF); Mmsg2(errmsg, _("ioctl MTFSF error on %s. ERR=%s.\n"), - print_name(), be.strerror()); + print_name(), be.bstrerror(my_errno)); Dmsg1(200, "%s", errmsg); return false; } - Dmsg2(200, "fsf file=%d block=%d\n", mt_stat.mt_fileno, mt_stat.mt_blkno); + + Dmsg1(200, "fsf file=%d\n", os_file); set_ateof(); - file = mt_stat.mt_fileno; + file = os_file; return true; /* @@ -1342,9 +1362,9 @@ bool DEVICE::fsf(int num) set_eot(); clrerror(-1); Dmsg2(100, "Set ST_EOT read errno=%d. ERR=%s\n", dev_errno, - be.strerror()); + be.bstrerror()); Mmsg2(errmsg, _("read error on %s. ERR=%s.\n"), - print_name(), be.strerror()); + print_name(), be.bstrerror()); Dmsg1(100, "%s", errmsg); break; } @@ -1366,14 +1386,14 @@ bool DEVICE::fsf(int num) } Dmsg0(100, "Doing MTFSF\n"); - stat = tape_ioctl(m_fd, MTIOCTOP, (char *)&mt_com); + stat = d_ioctl(m_fd, MTIOCTOP, (char *)&mt_com); if (stat < 0) { /* error => EOT */ berrno be; set_eot(); Dmsg0(100, "Set ST_EOT\n"); clrerror(MTFSF); Mmsg2(errmsg, _("ioctl MTFSF error on %s. ERR=%s.\n"), - print_name(), be.strerror()); + print_name(), be.bstrerror()); Dmsg0(100, "Got < 0 for MTFSF\n"); Dmsg1(100, "%s", errmsg); } else { @@ -1432,7 +1452,7 @@ bool DEVICE::bsf(int num) return false; } - Dmsg0(29, "bsf\n"); + Dmsg0(100, "bsf\n"); clear_eot(); clear_eof(); file -= num; @@ -1440,12 +1460,12 @@ bool DEVICE::bsf(int num) file_size = 0; mt_com.mt_op = MTBSF; mt_com.mt_count = num; - stat = tape_ioctl(m_fd, MTIOCTOP, (char *)&mt_com); + stat = d_ioctl(m_fd, MTIOCTOP, (char *)&mt_com); if (stat < 0) { berrno be; clrerror(MTBSF); Mmsg2(errmsg, _("ioctl MTBSF error on %s. ERR=%s.\n"), - print_name(), be.strerror()); + print_name(), be.bstrerror()); } return stat == 0; } @@ -1477,10 +1497,10 @@ bool DEVICE::fsr(int num) return false; } - Dmsg1(29, "fsr %d\n", num); + Dmsg1(100, "fsr %d\n", num); mt_com.mt_op = MTFSR; mt_com.mt_count = num; - stat = tape_ioctl(m_fd, MTIOCTOP, (char *)&mt_com); + stat = d_ioctl(m_fd, MTIOCTOP, (char *)&mt_com); if (stat == 0) { clear_eof(); block_num += num; @@ -1488,7 +1508,7 @@ bool DEVICE::fsr(int num) berrno be; struct mtget mt_stat; clrerror(MTFSR); - Dmsg1(100, "FSF fail: ERR=%s\n", be.strerror()); + Dmsg1(100, "FSF fail: ERR=%s\n", be.bstrerror()); if (dev_get_os_pos(this, &mt_stat)) { Dmsg4(100, "Adjust from %d:%d to %d:%d\n", file, block_num, mt_stat.mt_fileno, mt_stat.mt_blkno); @@ -1502,7 +1522,7 @@ bool DEVICE::fsr(int num) } } Mmsg3(errmsg, _("ioctl MTFSR %d error on %s. ERR=%s.\n"), - num, print_name(), be.strerror()); + num, print_name(), be.bstrerror()); } return stat == 0; } @@ -1533,18 +1553,18 @@ bool DEVICE::bsr(int num) return false; } - Dmsg0(29, "bsr_dev\n"); + Dmsg0(100, "bsr_dev\n"); block_num -= num; clear_eof(); clear_eot(); mt_com.mt_op = MTBSR; mt_com.mt_count = num; - stat = tape_ioctl(m_fd, MTIOCTOP, (char *)&mt_com); + stat = d_ioctl(m_fd, MTIOCTOP, (char *)&mt_com); if (stat < 0) { berrno be; clrerror(MTBSR); Mmsg2(errmsg, _("ioctl MTBSR error on %s. ERR=%s.\n"), - print_name(), be.strerror()); + print_name(), be.bstrerror()); } return stat == 0; } @@ -1555,7 +1575,7 @@ void DEVICE::lock_door() struct mtop mt_com; mt_com.mt_op = MTLOCK; mt_com.mt_count = 1; - tape_ioctl(m_fd, MTIOCTOP, (char *)&mt_com); + d_ioctl(m_fd, MTIOCTOP, (char *)&mt_com); #endif } @@ -1565,9 +1585,22 @@ void DEVICE::unlock_door() struct mtop mt_com; mt_com.mt_op = MTUNLOCK; mt_com.mt_count = 1; - tape_ioctl(m_fd, MTIOCTOP, (char *)&mt_com); + d_ioctl(m_fd, MTIOCTOP, (char *)&mt_com); #endif } + +void DEVICE::set_slot(int32_t slot) +{ + m_slot = slot; + if (vol) vol->clear_slot(); +} + +void DEVICE::clear_slot() +{ + m_slot = -1; + if (vol) vol->set_slot(-1); +} + /* @@ -1591,7 +1624,7 @@ bool DEVICE::reposition(DCR *dcr, uint32_t rfile, uint32_t rblock) berrno be; dev_errno = errno; Mmsg2(errmsg, _("lseek error on %s. ERR=%s.\n"), - print_name(), be.strerror()); + print_name(), be.bstrerror()); return false; } file = rfile; @@ -1634,7 +1667,7 @@ bool DEVICE::reposition(DCR *dcr, uint32_t rfile, uint32_t rblock) berrno be; dev_errno = errno; Dmsg2(30, "Failed to find requested block on %s: ERR=%s", - print_name(), be.strerror()); + print_name(), be.bstrerror()); return false; } Dmsg2(300, "moving forward wanted_blk=%d at_blk=%d\n", rblock, block_num); @@ -1654,7 +1687,7 @@ bool DEVICE::weof(int num) { struct mtop mt_com; int stat; - Dmsg0(129, "weof_dev\n"); + Dmsg1(129, "=== weof_dev=%s\n", print_name()); if (!is_open()) { dev_errno = EBADF; @@ -1677,7 +1710,7 @@ bool DEVICE::weof(int num) clear_eot(); mt_com.mt_op = MTWEOF; mt_com.mt_count = num; - stat = tape_ioctl(m_fd, MTIOCTOP, (char *)&mt_com); + stat = d_ioctl(m_fd, MTIOCTOP, (char *)&mt_com); if (stat == 0) { block_num = 0; file += num; @@ -1687,7 +1720,7 @@ bool DEVICE::weof(int num) clrerror(MTWEOF); if (stat == -1) { Mmsg2(errmsg, _("ioctl MTWEOF error on %s. ERR=%s.\n"), - print_name(), be.strerror()); + print_name(), be.bstrerror()); } } return stat == 0; @@ -1701,7 +1734,6 @@ bool DEVICE::weof(int num) void DEVICE::clrerror(int func) { const char *msg = NULL; - struct mtget mt_stat; char buf[100]; dev_errno = errno; /* save errno */ @@ -1804,16 +1836,12 @@ void DEVICE::clrerror(int func) */ /* On some systems such as NetBSD, this clears all errors */ - tape_ioctl(m_fd, MTIOCGET, (char *)&mt_stat); + get_os_tape_file(); -/* Found on Linux */ +/* Found on Solaris */ #ifdef MTIOCLRERR { - struct mtop mt_com; - mt_com.mt_op = MTIOCLRERR; - mt_com.mt_count = 1; - /* Clear any error condition on the tape */ - tape_ioctl(m_fd, MTIOCTOP, (char *)&mt_com); + d_ioctl(m_fd, MTIOCLRERR); Dmsg0(200, "Did MTIOCLRERR\n"); } #endif @@ -1825,8 +1853,8 @@ void DEVICE::clrerror(int func) /* Read and clear SCSI error status */ union mterrstat mt_errstat; Dmsg2(200, "Doing MTIOCERRSTAT errno=%d ERR=%s\n", dev_errno, - be.strerror(dev_errno)); - tape_ioctl(m_fd, MTIOCERRSTAT, (char *)&mt_errstat); + be.bstrerror(dev_errno)); + d_ioctl(m_fd, MTIOCERRSTAT, (char *)&mt_errstat); } #endif @@ -1837,12 +1865,35 @@ void DEVICE::clrerror(int func) mt_com.mt_op = MTCSE; mt_com.mt_count = 1; /* Clear any error condition on the tape */ - tape_ioctl(m_fd, MTIOCTOP, (char *)&mt_com); + d_ioctl(m_fd, MTIOCTOP, (char *)&mt_com); Dmsg0(200, "Did MTCSE\n"); } #endif } + +/* + * Set to unload the current volume in the drive + */ +void DEVICE::set_unload() +{ + if (!m_unload && VolHdr.VolumeName[0] != 0) { + m_unload = true; + memcpy(UnloadVolName, VolHdr.VolumeName, sizeof(UnloadVolName)); + } +} + + +/* + * Clear volume header + */ +void DEVICE::clear_volhdr() +{ + Dmsg1(100, "Clear volhdr vol=%s\n", VolHdr.VolumeName); + memset(&VolHdr, 0, sizeof(VolHdr)); +} + + /* * Close the device */ @@ -1860,27 +1911,30 @@ void DEVICE::close() } switch (dev_type) { + case B_VTL_DEV: + case B_VTAPE_DEV: case B_TAPE_DEV: unlock_door(); - tape_close(m_fd); - break; default: - ::close(m_fd); + d_close(m_fd); } /* Clean up device packet so it can be reused */ clear_opened(); - state &= ~(ST_LABEL|ST_READ|ST_APPEND|ST_EOT|ST_WEOT|ST_EOF); + /* + * Be careful not to clear items needed by the DVD driver + * when it is closing a single part. + */ + state &= ~(ST_LABEL|ST_READ|ST_APPEND|ST_EOT|ST_WEOT|ST_EOF| + ST_MOUNTED|ST_MEDIA|ST_SHORT); label_type = B_BACULA_LABEL; file = block_num = 0; file_size = 0; file_addr = 0; EndFile = EndBlock = 0; openmode = 0; - Slot = -1; /* unknown slot */ - free_volume(this); + clear_volhdr(); memset(&VolCatInfo, 0, sizeof(VolCatInfo)); - memset(&VolHdr, 0, sizeof(VolHdr)); if (tid) { stop_thread_timer(tid); tid = 0; @@ -1896,7 +1950,7 @@ void DEVICE::close() * the Volume parts multiple times without losing track of what the * main Volume parameters are. */ -void DEVICE::close_part(DCR *dcr) +void DEVICE::close_part(DCR * /*dcr*/) { VOLUME_LABEL saveVolHdr; VOLUME_CAT_INFO saveVolCatInfo; /* Volume Catalog Information */ @@ -1907,7 +1961,6 @@ void DEVICE::close_part(DCR *dcr) close(); /* close current part */ VolHdr = saveVolHdr; /* structure assignment */ VolCatInfo = saveVolCatInfo; /* structure assignment */ - dcr->VolCatInfo = saveVolCatInfo; /* structure assignment */ } boffset_t DEVICE::lseek(DCR *dcr, boffset_t offset, int whence) @@ -1928,23 +1981,74 @@ boffset_t DEVICE::lseek(DCR *dcr, boffset_t offset, int whence) bool DEVICE::truncate(DCR *dcr) /* We need the DCR for DVD-writing */ { + struct stat st; + Dmsg1(100, "truncate %s\n", print_name()); switch (dev_type) { + case B_VTL_DEV: + case B_VTAPE_DEV: case B_TAPE_DEV: /* maybe we should rewind and write and eof ???? */ return true; /* we don't really truncate tapes */ case B_DVD_DEV: return truncate_dvd(dcr); case B_FILE_DEV: - /* ***FIXME*** we really need to unlink() the file so that - * its name can be changed for a relabel. - */ if (ftruncate(m_fd, 0) != 0) { berrno be; Mmsg2(errmsg, _("Unable to truncate device %s. ERR=%s\n"), - print_name(), be.strerror()); + print_name(), be.bstrerror()); + return false; + } + + /* + * Check for a successful ftruncate() and issue a work-around for devices + * (mostly cheap NAS) that don't support truncation. + * Workaround supplied by Martin Schmid as a solution to bug #1011. + * 1. close file + * 2. delete file + * 3. open new file with same mode + * 4. change ownership to original + */ + + if (fstat(m_fd, &st) != 0) { + berrno be; + Mmsg2(errmsg, _("Unable to stat device %s. ERR=%s\n"), + print_name(), be.bstrerror()); return false; } + + if (st.st_size != 0) { /* ftruncate() didn't work */ + POOL_MEM archive_name(PM_FNAME); + + pm_strcpy(archive_name, dev_name); + if (!IsPathSeparator(archive_name.c_str()[strlen(archive_name.c_str())-1])) { + pm_strcat(archive_name, "/"); + } + pm_strcat(archive_name, dcr->VolumeName); + + Mmsg2(errmsg, _("Device %s doesn't support ftruncate(). Recreating file %s.\n"), + print_name(), archive_name.c_str()); + + /* Close file and blow it away */ + ::close(m_fd); + ::unlink(archive_name.c_str()); + + /* Recreate the file -- of course, empty */ + set_mode(CREATE_READ_WRITE); + if ((m_fd = ::open(archive_name.c_str(), mode, st.st_mode)) < 0) { + berrno be; + dev_errno = errno; + Mmsg2(errmsg, _("Could not reopen: %s, ERR=%s\n"), archive_name.c_str(), + be.bstrerror()); + Dmsg1(100, "reopen failed: %s", errmsg); + Emsg0(M_FATAL, 0, errmsg); + return false; + } + + /* Reset proper owner */ + chown(archive_name.c_str(), st.st_uid, st.st_gid); + } + return true; } return false; @@ -1971,7 +2075,7 @@ bool DEVICE::mount(int timeout) */ bool DEVICE::unmount(int timeout) { - Dmsg0(90, "Enter unmount\n"); + Dmsg0(100, "Enter unmount\n"); if (is_mounted()) { return do_mount(0, timeout); } @@ -1986,7 +2090,7 @@ bool DEVICE::do_mount(int mount, int dotimeout) char *icmd; int status, timeout; - sm_check(__FILE__, __LINE__, false); + Dsm_check(1); if (mount) { if (is_mounted()) { Dmsg0(200, "======= mount=1\n"); @@ -2013,10 +2117,9 @@ bool DEVICE::do_mount(int mount, int dotimeout) timeout = 0; } results = get_memory(4000); - results[0] = 0; /* If busy retry each second */ - Dmsg1(20, "do_mount run_prog=%s\n", ocmd.c_str()); + Dmsg1(100, "do_mount run_prog=%s\n", ocmd.c_str()); while ((status = run_program_full_output(ocmd.c_str(), max_open_wait/2, results)) != 0) { /* Doesn't work with internationalization (This is not a problem) */ @@ -2038,12 +2141,12 @@ bool DEVICE::do_mount(int mount, int dotimeout) } if (status != 0) { berrno be; - Dmsg5(40, "Device %s cannot be %smounted. stat=%d result=%s ERR=%s\n", print_name(), - (mount ? "" : "un"), status, results, be.strerror(status)); + Dmsg5(100, "Device %s cannot be %smounted. stat=%d result=%s ERR=%s\n", print_name(), + (mount ? "" : "un"), status, results, be.bstrerror(status)); Mmsg(errmsg, _("Device %s cannot be %smounted. ERR=%s\n"), - print_name(), (mount ? "" : "un"), be.strerror(status)); + print_name(), (mount ? "" : "un"), be.bstrerror(status)); } else { - Dmsg4(40, "Device %s cannot be %smounted. stat=%d ERR=%s\n", print_name(), + Dmsg4(100, "Device %s cannot be %smounted. stat=%d ERR=%s\n", print_name(), (mount ? "" : "un"), status, results); Mmsg(errmsg, _("Device %s cannot be %smounted. ERR=%s\n"), print_name(), (mount ? "" : "un"), results); @@ -2065,8 +2168,8 @@ bool DEVICE::do_mount(int mount, int dotimeout) if (!(dp = opendir(device->mount_point))) { berrno be; dev_errno = errno; - Dmsg3(29, "do_mount: failed to open dir %s (dev=%s), ERR=%s\n", - device->mount_point, print_name(), be.strerror()); + Dmsg3(100, "do_mount: failed to open dir %s (dev=%s), ERR=%s\n", + device->mount_point, print_name(), be.bstrerror()); goto get_out; } @@ -2089,7 +2192,7 @@ bool DEVICE::do_mount(int mount, int dotimeout) free(entry); closedir(dp); - Dmsg1(29, "do_mount: got %d files in the mount point (not counting ., .. and .keep)\n", count); + Dmsg1(100, "do_mount: got %d files in the mount point (not counting ., .. and .keep)\n", count); if (count > 0) { /* If we got more than ., .. and .keep */ @@ -2107,9 +2210,9 @@ bool DEVICE::do_mount(int mount, int dotimeout) } get_out: set_mounted(false); - sm_check(__FILE__, __LINE__, false); free_pool_memory(results); Dmsg0(200, "============ mount=0\n"); + Dsm_check(1); return false; } @@ -2195,12 +2298,15 @@ void DEVICE::edit_mount_codes(POOL_MEM &omsg, const char *imsg) } } -/* return the last timer interval (ms) */ +/* return the last timer interval (ms) + * or 0 if something goes wrong + */ btime_t DEVICE::get_timer_count() { - btime_t old = last_timer; + btime_t temp = last_timer; last_timer = get_current_btime(); - return last_timer - old; + temp = last_timer - temp; /* get elapsed time */ + return (temp>0)?temp:0; /* take care of skewed clock */ } /* read from fd */ @@ -2210,11 +2316,7 @@ ssize_t DEVICE::read(void *buf, size_t len) get_timer_count(); - if (this->is_tape()) { - read_len = tape_read(m_fd, buf, len); - } else { - read_len = ::read(m_fd, buf, len); - } + read_len = d_read(m_fd, buf, len); last_tick = get_timer_count(); @@ -2235,11 +2337,7 @@ ssize_t DEVICE::write(const void *buf, size_t len) get_timer_count(); - if (this->is_tape()) { - write_len = tape_write(m_fd, buf, len); - } else { - write_len = ::write(m_fd, buf, len); - } + write_len = d_write(m_fd, buf, len); last_tick = get_timer_count(); @@ -2259,6 +2357,18 @@ const char *DEVICE::name() const return device->hdr.name; } +/* Returns file position on tape or -1 */ +int32_t DEVICE::get_os_tape_file() +{ + struct mtget mt_stat; + + if (has_cap(CAP_MTIOCGET) && + d_ioctl(m_fd, MTIOCGET, (char *)&mt_stat) == 0) { + return mt_stat.mt_fileno; + } + return -1; +} + char * dev_vol_name(DEVICE *dev) { @@ -2316,7 +2426,6 @@ void init_device_wait_timers(DCR *dcr) dev->rem_wait_sec = dev->wait_sec; dev->num_wait = 0; dev->poll = false; - dev->BadVolName[0] = 0; jcr->min_wait = 60 * 60; jcr->max_wait = 24 * 60 * 60; @@ -2364,23 +2473,27 @@ void set_os_device_parameters(DCR *dcr) { DEVICE *dev = dcr->dev; + if (strcmp(dev->dev_name, "/dev/null") == 0) { + return; /* no use trying to set /dev/null */ + } + #if defined(HAVE_LINUX_OS) || defined(HAVE_WIN32) struct mtop mt_com; - Dmsg0(050, "In set_os_device_parameters\n"); + Dmsg0(100, "In set_os_device_parameters\n"); #if defined(MTSETBLK) if (dev->min_block_size == dev->max_block_size && dev->min_block_size == 0) { /* variable block mode */ mt_com.mt_op = MTSETBLK; mt_com.mt_count = 0; - Dmsg0(050, "Set block size to zero\n"); - if (tape_ioctl(dev->fd(), MTIOCTOP, (char *)&mt_com) < 0) { + Dmsg0(100, "Set block size to zero\n"); + if (dev->d_ioctl(dev->fd(), MTIOCTOP, (char *)&mt_com) < 0) { dev->clrerror(MTSETBLK); } } #endif #if defined(MTSETDRVBUFFER) - if (getpid() == 0) { /* Only root can do this */ + if (getuid() == 0) { /* Only root can do this */ mt_com.mt_op = MTSETDRVBUFFER; mt_com.mt_count = MT_ST_CLEARBOOLEANS; if (!dev->has_cap(CAP_TWOEOF)) { @@ -2389,8 +2502,8 @@ void set_os_device_parameters(DCR *dcr) if (dev->has_cap(CAP_EOM)) { mt_com.mt_count |= MT_ST_FAST_MTEOM; } - Dmsg0(050, "MTSETDRVBUFFER\n"); - if (tape_ioctl(dev->fd(), MTIOCTOP, (char *)&mt_com) < 0) { + Dmsg0(100, "MTSETDRVBUFFER\n"); + if (dev->d_ioctl(dev->fd(), MTIOCTOP, (char *)&mt_com) < 0) { dev->clrerror(MTSETDRVBUFFER); } } @@ -2404,13 +2517,13 @@ void set_os_device_parameters(DCR *dcr) dev->min_block_size == 0) { /* variable block mode */ mt_com.mt_op = MTSETBSIZ; mt_com.mt_count = 0; - if (tape_ioctl(dev->fd(), MTIOCTOP, (char *)&mt_com) < 0) { + if (dev->d_ioctl(dev->fd(), MTIOCTOP, (char *)&mt_com) < 0) { dev->clrerror(MTSETBSIZ); } /* Get notified at logical end of tape */ mt_com.mt_op = MTEWARN; mt_com.mt_count = 1; - if (tape_ioctl(dev->fd(), MTIOCTOP, (char *)&mt_com) < 0) { + if (dev->d_ioctl(dev->fd(), MTIOCTOP, (char *)&mt_com) < 0) { dev->clrerror(MTEWARN); } } @@ -2423,23 +2536,22 @@ void set_os_device_parameters(DCR *dcr) dev->min_block_size == 0) { /* variable block mode */ mt_com.mt_op = MTSETBSIZ; mt_com.mt_count = 0; - if (tape_ioctl(dev->fd(), MTIOCTOP, (char *)&mt_com) < 0) { + if (dev->d_ioctl(dev->fd(), MTIOCTOP, (char *)&mt_com) < 0) { dev->clrerror(MTSETBSIZ); } } -/* Turn this on later when fully tested */ -#if defined(xxxMTIOCSETEOTMODEL) +#if defined(MTIOCSETEOTMODEL) uint32_t neof; if (dev->has_cap(CAP_TWOEOF)) { neof = 2; } else { neof = 1; } - if (ioctl(dev->fd(), MTIOCSETEOTMODEL, (caddr_t)&neof) < 0) { + if (dev->d_ioctl(dev->fd(), MTIOCSETEOTMODEL, (caddr_t)&neof) < 0) { berrno be; dev->dev_errno = errno; /* save errno */ Mmsg2(dev->errmsg, _("Unable to set eotmodel on device %s: ERR=%s\n"), - dev->print_name(), be.strerror(dev->dev_errno)); + dev->print_name(), be.bstrerror(dev->dev_errno)); Jmsg(dcr->jcr, M_FATAL, 0, dev->errmsg); } #endif @@ -2452,7 +2564,7 @@ void set_os_device_parameters(DCR *dcr) dev->min_block_size == 0) { /* variable block mode */ mt_com.mt_op = MTSRSZ; mt_com.mt_count = 0; - if (tape_ioctl(dev->fd(), MTIOCTOP, (char *)&mt_com) < 0) { + if (dev->d_ioctl(dev->fd(), MTIOCTOP, (char *)&mt_com) < 0) { dev->clrerror(MTSRSZ); } } @@ -2462,13 +2574,13 @@ void set_os_device_parameters(DCR *dcr) static bool dev_get_os_pos(DEVICE *dev, struct mtget *mt_stat) { - Dmsg0(050, "dev_get_os_pos\n"); + Dmsg0(100, "dev_get_os_pos\n"); return dev->has_cap(CAP_MTIOCGET) && - tape_ioctl(dev->fd(), MTIOCGET, (char *)mt_stat) == 0 && + dev->d_ioctl(dev->fd(), MTIOCGET, (char *)mt_stat) == 0 && mt_stat->mt_fileno >= 0; } -static char *modes[] = { +static const char *modes[] = { "CREATE_READ_WRITE", "OPEN_READ_WRITE", "OPEN_READ_ONLY", @@ -2476,7 +2588,7 @@ static char *modes[] = { }; -static char *mode_to_str(int mode) +static const char *mode_to_str(int mode) { static char buf[100]; if (mode < 1 || mode > 4) {