diff options
-rw-r--r-- | daemon/Makefile.am | 1 | ||||
-rw-r--r-- | daemon/internal.c | 46 | ||||
-rw-r--r-- | daemon/sync.c | 18 | ||||
-rw-r--r-- | po/POTFILES.in | 1 |
4 files changed, 48 insertions, 18 deletions
diff --git a/daemon/Makefile.am b/daemon/Makefile.am index a19a1570..3a698cc7 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -123,6 +123,7 @@ guestfsd_SOURCES = \ htonl.c \ initrd.c \ inotify.c \ + internal.c \ is.c \ link.c \ ls.c \ diff --git a/daemon/internal.c b/daemon/internal.c new file mode 100644 index 00000000..c8ae7fd9 --- /dev/null +++ b/daemon/internal.c @@ -0,0 +1,46 @@ +/* libguestfs - the guestfsd daemon + * Copyright (C) 2012 Red Hat Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +/* Internal functions are not part of the public API. */ + +#include <config.h> + +#include <stdio.h> +#include <stdlib.h> +#include <unistd.h> + +#include "daemon.h" +#include "actions.h" + +/* Older versions of libguestfs used to issue separate 'umount_all' + * and 'sync' commands just before closing the handle. Since + * libguestfs 1.9.7 the library issues this 'internal_autosync' + * internal operation instead, allowing more control in the daemon. + */ +int +do_internal_autosync (void) +{ + int r = 0; + + if (autosync_umount) + r = do_umount_all (); + + sync_disks (); + + return r; +} diff --git a/daemon/sync.c b/daemon/sync.c index bdde4e00..fcb887e2 100644 --- a/daemon/sync.c +++ b/daemon/sync.c @@ -43,24 +43,6 @@ do_sync (void) return 0; } -/* Older versions of libguestfs used to issue separate 'umount_all' - * and 'sync' commands just before closing the handle. Since - * libguestfs 1.9.7 the library issues this 'internal_autosync' - * internal operation instead, allowing more control in the daemon. - */ -int -do_internal_autosync (void) -{ - int r = 0; - - if (autosync_umount) - r = do_umount_all (); - - sync_disks (); - - return r; -} - /* This is a replacement for sync(2) which is called from * this file and from other places in the daemon. It works * on Windows too. diff --git a/po/POTFILES.in b/po/POTFILES.in index 4ed598e6..3a43d176 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -42,6 +42,7 @@ daemon/hexdump.c daemon/htonl.c daemon/initrd.c daemon/inotify.c +daemon/internal.c daemon/is.c daemon/link.c daemon/ls.c |