libfrog: always fsync when flushing a device
Always call fsync() when we're flushing a device, even if it is a block
device. It's probably redundant to call fsync /and/ BLKFLSBUF, but the
latter has odd behavior so we want to make sure the standard flush
methods have a chance to run first.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
diff --git a/libfrog/linux.c b/libfrog/linux.c
index 60bc1dc..40a839d 100644
--- a/libfrog/linux.c
+++ b/libfrog/linux.c
@@ -155,14 +155,18 @@
if (major(device) == RAMDISK_MAJOR)
return 0;
+ ret = fsync(fd);
+ if (ret)
+ return ret;
+
ret = fstat(fd, &st);
if (ret)
return ret;
- if (S_ISREG(st.st_mode))
- return fsync(fd);
+ if (S_ISBLK(st.st_mode))
+ return ioctl(fd, BLKFLSBUF, 0);
- return ioctl(fd, BLKFLSBUF, 0);
+ return 0;
}
void
