- improved fadvise usage

diff --git a/package/snapper.changes b/package/snapper.changes
index cc04e1d09c168bbadeb1f746f5cba4a2f08765b9..e906c29e200c617162a3979976e414515e03bebd 100644 (file)
--- a/package/snapper.changes
+++ b/package/snapper.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct 10 12:15:36 CEST 2014 - aschnell@suse.de
+
+- improved fadvise usage
+
 -------------------------------------------------------------------
 Fri Oct 3 01:05:01 CEST 2014 - dsterba@suse.cz
 

diff --git a/snapper/AppUtil.cc b/snapper/AppUtil.cc
index f3804bf9ab41c06eac0b3c4f5e29a1fe4f163866..2db7269b51013aaf9b7e40f322946c8bc3467e68 100644 (file)
--- a/snapper/AppUtil.cc
+++ b/snapper/AppUtil.cc
@@ -91,6 +91,11 @@ namespace snapper
     bool
     copyfile(int src_fd, int dest_fd)
     {
+       posix_fadvise(src_fd, 0, 0, POSIX_FADV_SEQUENTIAL);
+
+       // TODO: maybe use POSIX_FADV_DONTNEED on dest_fd, but this could
+       // trigger a kernel bug (see bsc #888259)
+
        while (true)
        {
            // use small value for count to make function better interruptible

diff --git a/snapper/Compare.cc b/snapper/Compare.cc
index 576845a640b9a3af7b9f0635ab9187ac07ec60df..50069a549603d46df2cd3c41109fff4d8614456d 100644 (file)
--- a/snapper/Compare.cc
+++ b/snapper/Compare.cc
@@ -77,8 +77,8 @@ namespace snapper
            return false;
        }
 
-       posix_fadvise(fd1, 0, stat1.st_size, POSIX_FADV_SEQUENTIAL);
-       posix_fadvise(fd2, 0, stat2.st_size, POSIX_FADV_SEQUENTIAL);
+       posix_fadvise(fd1, 0, 0, POSIX_FADV_SEQUENTIAL);
+       posix_fadvise(fd2, 0, 0, POSIX_FADV_SEQUENTIAL);
 
        static_assert(sizeof(off_t) >= 8, "off_t is too small");