From f862c6241302ac122df063cc53a97582841dbc6f Mon Sep 17 00:00:00 2001 From: Louis Yung-Chieh Lo Date: Wed, 16 Jan 2013 11:52:17 +0800 Subject: (cherry-pick for R25)(modify and resend) Trigger sync right after writing. This can trigger the sync mechanism earlier so that the kernel has enough time to schedule a real disk sync before system reboots. We sent this in CL 41269, however it is reverted because the sync() and syncfs() make test cases timeout (tons of disk access). So we only sync file itself in this CL and leave the whoe system sync outside cgpt. BUG=chromium-os:35992 TEST=make && make runtests ; and trybot BRANCH=none Original-Change-Id: I9c6b602220131f1f011e7865788a122d4c379e73 (cherry picked from commit 8e9b61a8f9e0d1446a2ac98db1959ed561880d91) Change-Id: I5f419332cc5887d734f507533927e049e6cfbbf0 Reviewed-on: https://gerrit.chromium.org/gerrit/42211 Reviewed-by: Hung-Te Lin Commit-Queue: Yung-Chieh Lo Tested-by: Yung-Chieh Lo --- cgpt/cgpt_common.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cgpt/cgpt_common.c b/cgpt/cgpt_common.c index 193f2e1e..8def05ef 100644 --- a/cgpt/cgpt_common.c +++ b/cgpt/cgpt_common.c @@ -269,6 +269,11 @@ int DriveClose(struct drive *drive, int update_as_needed) { } } + // Sync early! Only sync file descriptor here, and leave the whole system sync + // outside cgpt because whole system sync would trigger tons of disk accesses + // and timeout tests. + fsync(drive->fd); + close(drive->fd); if (drive->gpt.primary_header) -- cgit v1.2.1