From: Theodore Ts'o <tytso@mit.edu>
Date: Fri, 28 Jul 2017 00:07:22 +0000 (-0400)
Subject: Merge branch 'maint' into next
X-Git-Tag: v1.44.0-rc1~54
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fed2dbdc64724af99751f8168d78551d3f02d8bf;p=thirdparty%2Fe2fsprogs.git

Merge branch 'maint' into next
---

fed2dbdc64724af99751f8168d78551d3f02d8bf
diff --cc lib/ext2fs/flushb.c
index fe1d3e7d8,1b9c671a1..bb7daf438
--- a/lib/ext2fs/flushb.c
+++ b/lib/ext2fs/flushb.c
@@@ -58,12 -58,11 +58,13 @@@ errcode_t ext2fs_sync_device(int fd, in
  	 * still is a race condition for those kernels, but this
  	 * reduces it greatly.)
  	 */
 +#if defined(HAVE_FSYNC)
  	if (fsync (fd) == -1)
  		return errno;
 +#endif
  
  	if (flushb) {
+ 		errcode_t	retval = 0;
  
  #ifdef BLKFLSBUF
  		if (ioctl (fd, BLKFLSBUF, 0) == 0)