Use seek() with FO_OFFSETS

diff --git a/bacula/src/filed/restore.c b/bacula/src/filed/restore.c
index 261c642305494498fe0dcf629a266a5c28455613..186f36c57202a4524ed1998fd6e9ce2b57c86178 100644 (file)
--- a/bacula/src/filed/restore.c
+++ b/bacula/src/filed/restore.c
@@ -1217,8 +1217,7 @@ bool sparse_data(JCR *jcr, BFILE *bfd, uint64_t *addr, char **data, uint32_t *le
    char ec1[50];
    unser_begin(*data, OFFSET_FADDR_SIZE);
    unser_uint64(faddr);
-   /* We seek only if we have a SPARSE stream, not for OFFSET */
-   if ((flags & FO_SPARSE) && *addr != faddr) {
+   if (*addr != faddr) {
       *addr = faddr;
       if (blseek(bfd, (boffset_t)*addr, SEEK_SET) < 0) {
          berrno be;

diff --git a/bacula/src/stored/bextract.c b/bacula/src/stored/bextract.c
index b898bb3d33669c809925f2cd072626dd85eb819c..a1a2029b1cd8c96a0001c80456d4a7fabf722f6c 100644 (file)
--- a/bacula/src/stored/bextract.c
+++ b/bacula/src/stored/bextract.c
@@ -488,8 +488,7 @@ static bool record_cb(DCR *dcr, DEV_RECORD *rec)
             wsize = rec->data_len - OFFSET_FADDR_SIZE;
             ser_begin(rec->data, OFFSET_FADDR_SIZE);
             unser_uint64(faddr);
-            /* We seek only for real SPARSE data, not for OFFSET option */
-            if ((rec->Stream & STREAM_BIT_OFFSETS) == 0 && fileAddr != faddr) {
+            if (fileAddr != faddr) {
                fileAddr = faddr;
                if (blseek(&bfd, (boffset_t)fileAddr, SEEK_SET) < 0) {
                   berrno be;