This patch is needed in order to build Guix on a Btrfs file system. From da922703282b0d3b8837a99a9c7fdd32f1d20d49 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 9 Jan 2018 20:16:14 -0500 Subject: [PATCH] Remove nonportable check for files containing only zeroes. This check benefitted only one unlikely case (large files containing only zeroes, on systems that do not support SEEK_HOLE) and was based on an assumption about file system behavior that is not mandated by POSIX and no longer holds in practice, namely that for sufficiently large files, (st_blocks == 0) implies that the file contains only zeroes. Examples of file systems that violate this assumption include Linux's /proc file system and Btrfs. * src/sparse.c (sparse_scan_file_wholesparse): Remove this function. (sparse_scan_file_seek): Remove the initial check for files containing only zeroes. --- src/sparse.c | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/src/sparse.c b/src/sparse.c index d41c0ea..3de6560 100644 --- a/src/sparse.c +++ b/src/sparse.c @@ -261,26 +261,6 @@ sparse_scan_file_raw (struct tar_sparse_file *file) return tar_sparse_scan (file, scan_end, NULL); } -static bool -sparse_scan_file_wholesparse (struct tar_sparse_file *file) -{ - struct tar_stat_info *st = file->stat_info; - struct sp_array sp = {0, 0}; - - /* Note that this function is called only for truly sparse files of size >= 1 - block size (checked via ST_IS_SPARSE before). See the thread - http://www.mail-archive.com/bug-tar@gnu.org/msg04209.html for more info */ - if (ST_NBLOCKS (st->stat) == 0) - { - st->archive_file_size = 0; - sp.offset = st->stat.st_size; - sparse_add_map (st, &sp); - return true; - } - - return false; -} - #ifdef SEEK_HOLE /* Try to engage SEEK_HOLE/SEEK_DATA feature. */ static bool @@ -343,10 +323,6 @@ sparse_scan_file_seek (struct tar_sparse_file *file) static bool sparse_scan_file (struct tar_sparse_file *file) { - /* always check for completely sparse files */ - if (sparse_scan_file_wholesparse (file)) - return true; - switch (hole_detection) { case HOLE_DETECTION_DEFAULT: -- 2.15.1 6f3656375be4'>tests/rsync.scm
AgeCommit message (Expand)Author
2018-10-18services: dhcp-client: Deprecate 'dhcp-client-service' procedure....* gnu/services/networking.scm (dhcp-client-service-type): Add default value. * gnu/system/examples/bare-bones.tmpl: Use (service dhcp-client-service-type) instead of (dhcp-client-service). * gnu/system/examples/beaglebone-black.tmpl: Likewise. * gnu/tests/base.scm (%avahi-os): Likewise. * gnu/tests/databases.scm (%memcached-os): Likewise. (%mongodb-os): Likewise. * gnu/tests/dict.scm (%dicod-os): Likewise. * gnu/tests/mail.scm (%opensmtpd-os): Likewise. (%exim-os): Likewise. (%dovecot-os): Likewise. * gnu/tests/messaging.scm (run-xmpp-test): Likewise. (run-bitlbee-test): Likewise. * gnu/tests/monitoring.scm (%prometheus-node-exporter-os): Likewise. * gnu/tests/networking.scm (%inetd-os): Likewise. (run-iptables-test): Likewise. * gnu/tests/nfs.scm (%base-os): Likewise. * gnu/tests/rsync.scm (%rsync-os): Likewise. * gnu/tests/ssh.scm (run-ssh-test): Likewise. * gnu/tests/version-control.scm (%cgit-os): Likewise. (%git-http-os): Likewise. (%gitolite-os): Likewise. * gnu/tests/virtualization.scm (%libvirt-os): Likewise. * gnu/tests/web.scm (%httpd-os): Likewise. (%nginx-os): Likewise. (%varnish-os): Likewise. (%php-fpm-os): Likewise. (%hpcguix-web-os): Likewise. (%tailon-os): Likewise. * tests/guix-system.sh: Likewise. * doc/guix.texi (Networking Services): Document 'dhcp-client-service-type' and remove 'dhcp-client-service'. Ludovic Courtès
2018-06-13tests: Honor the return value of 'start-service'....Since commit dc7b3e56337ee9d8dcd8fe7d5cab71ef536d024f, 'start-service' returns the Shepherd's representation of the service as a sexp, and '#f' if the service fails to start. Also, it doesn't throw an exception when the service fails to start, so relying on an exception instead of relying on its return value is a false positive. * gnu/tests/base.scm (run-nss-mdns-test): Split tests so to check the return value of 'start-service'. (run-mcron-test, run-nss-mdns-test): Use 'test-assert' with the return value of 'start-service'. * gnu/tests/admin.scm (run-tailon-test): Idem. * gnu/tests/dict.scm (run-dicod-test): Idem. * gnu/tests/mail.scm (run-opensmtpd-test, run-exim-test, run-dovecot-test): Idem. * gnu/tests/messaging.scm (run-xmpp-test, run-bitlbee-test): Idem. * gnu/tests/nfs.scm (run-nfs-test): Idem. * gnu/tests/rsync.scm (run-rsync-test): Idem. * gnu/tests/ssh.scm (run-ssh-test): Idem. * gnu/tests/version-control.scm (run-cgit-test, run-git-http-test): Idem. * gnu/tests/web.scm (run-php-fpm-test): Idem. Clément Lassieur
2017-09-23gnu: Add rsync service....* doc/guix.texi (Networking Services): Add rsync service documentation. * gnu/services/rsync.scm (<rsync-configuration>): New file. * gnu/tests/rsync.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add new files. Signed-off-by: Christopher Baines <mail@cbaines.net> Oleg Pykhalov