/*
Bacula® - The Network Backup Solution
- Copyright (C) 2001-2006 Free Software Foundation Europe e.V.
+ Copyright (C) 2001-2007 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.
}
if (!dcr->dev_locked) { /* device already locked? */
- lock_device(dev); /* no, lock it */
+ dev->r_dlock(); /* no, lock it */
}
/*
bail_out:
if (!dcr->dev_locked) { /* did we lock dev above? */
- unlock_device(dev); /* unlock it now */
+ dev->dunlock(); /* unlock it now */
}
return stat;
}
bmicrosleep(5, 0); /* pause a bit if busy or lots of errors */
dev->clrerror(-1);
}
- if (dev->is_tape()) {
- stat = tape_write(dev->fd, block->buf, (size_t)wlen);
- } else {
- stat = write(dev->fd, block->buf, (size_t)wlen);
- }
+ stat = dev->write(block->buf, (size_t)wlen);
+
} while (stat == -1 && (errno == EBUSY || errno == EIO) && retry++ < 3);
#ifdef DEBUG_BLOCK_ZEROING
dev->file, dev->block_num, dev->print_name(), wlen, stat);
}
Dmsg7(100, "=== Write error. fd=%d size=%u rtn=%d dev_blk=%d blk_blk=%d errno=%d: ERR=%s\n",
- dev->fd, wlen, stat, dev->block_num, block->BlockNumber,
+ dev->fd(), wlen, stat, dev->block_num, block->BlockNumber,
dev->dev_errno, strerror(dev->dev_errno));
ok = terminate_writing_volume(dcr);
}
bstrncpy(dev->VolCatInfo.VolCatStatus, "Full", sizeof(dev->VolCatInfo.VolCatStatus));
dev->VolCatInfo.VolCatFiles = dev->file; /* set number of files */
- dev->VolCatInfo.VolCatJobs++; /* increment number of jobs */
if (dev->is_dvd()) {
if (!dvd_write_part(dcr)) { /* write last part */
bool ok;
DEVICE *dev = dcr->dev;
Dmsg0(200, "Enter read_block_from_device\n");
- lock_device(dev);
+ dev->r_dlock();
ok = read_block_from_dev(dcr, check_block_numbers);
- unlock_device(dev);
+ dev->dunlock();
Dmsg0(200, "Leave read_block_from_device\n");
return ok;
}
if (dev->at_eof() && dev->is_dvd()) {
Dmsg1(100, "file_size=%u\n",(unsigned int)dev->file_size);
Dmsg1(100, "file_addr=%u\n",(unsigned int)dev->file_addr);
- Dmsg1(100, "lseek=%u\n",(unsigned int)lseek(dev->fd, 0, SEEK_CUR));
+ Dmsg1(100, "lseek=%u\n",(unsigned int)lseek(dev->fd(), 0, SEEK_CUR));
Dmsg1(100, "part_start=%u\n",(unsigned int)dev->part_start);
Dmsg1(100, "part_size=%u\n", (unsigned int)dev->part_size);
Dmsg2(100, "part=%u num_dvd_parts=%u\n", dev->part, dev->num_dvd_parts);
bmicrosleep(10, 0); /* pause a bit if busy or lots of errors */
dev->clrerror(-1);
}
- if (dev->is_tape()) {
- stat = tape_read(dev->fd, block->buf, (size_t)block->buf_len);
- } else {
- stat = read(dev->fd, block->buf, (size_t)block->buf_len);
- }
+ stat = dev->read(block->buf, (size_t)block->buf_len);
+
} while (stat == -1 && (errno == EBUSY || errno == EINTR || errno == EIO) && retry++ < 3);
if (stat < 0) {
berrno be;
Dmsg1(200, "Read device got: ERR=%s\n", be.strerror());
block->read_len = 0;
Mmsg5(dev->errmsg, _("Read error on fd=%d at file:blk %u:%u on device %s. ERR=%s.\n"),
- dev->fd, dev->file, dev->block_num, dev->print_name(), be.strerror());
+ dev->fd(), dev->file, dev->block_num, dev->print_name(), be.strerror());
Jmsg(jcr, M_ERROR, 0, "%s", dev->errmsg);
if (dev->at_eof()) { /* EOF just seen? */
dev->set_eot(); /* yes, error => EOT */