From: Richard W.M. Jones <rjones@redhat.com>
Date: Fri, 23 Sep 2011 10:25:27 +0000 (+0100)
Subject: Use ext2fs_close2 API if available to avoid unnecessary fsync.
X-Git-Tag: 3.11~7
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=e576d2ec46adefa14b2d9c3d51e7f19a7810f909;p=febootstrap.git

Use ext2fs_close2 API if available to avoid unnecessary fsync.

This saves over 5 seconds during the slow path construction of the
appliance.

The ext2fs_close2 API is present in the e2fsprogs 'next' branch and
will be in a later e2fsprogs release (thanks Ted Ts'o).
---

diff --git a/configure.ac b/configure.ac
index a75a581..23c876b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -105,6 +105,7 @@ old_LIBS="$LIBS"
 AC_CHECK_LIB([ext2fs],[ext2fs_file_open2],[],[
   AC_MSG_FAILURE([libext2fs library not found (part of e2fsprogs)])
 ])
+AC_CHECK_FUNCS([ext2fs_close2])
 LIBS="$old_LIBS"
 
 AC_CHECK_HEADER([ext2fs/ext2fs.h],[],[
diff --git a/helper/ext2.c b/helper/ext2.c
index 2395871..56ad5e5 100644
--- a/helper/ext2.c
+++ b/helper/ext2.c
@@ -107,8 +107,16 @@ ext2_start (const char *hostcpu, const char *appliance,
 static void
 ext2_end (void)
 {
+  if (verbose)
+    print_timestamped_message ("closing ext2 filesystem");
+
   /* Write out changes and close. */
-  errcode_t err = ext2fs_close (fs);
+  errcode_t err;
+#ifdef HAVE_EXT2FS_CLOSE2
+  err = ext2fs_close2 (fs, EXT2_FLAG_FLUSH_NO_SYNC);
+#else
+  err = ext2fs_close (fs);
+#endif
   if (err != 0)
     error (EXIT_FAILURE, 0, "ext2fs_close: %s", error_message (err));
 }