xfs_db: flush devices before exiting

Test 287 uses xfs_db to change 32-bit project ID support while the
filesystem is unmounted. On a large filesystem the test was failing
due to the mount not seeing the feature bit in the superblock.

xfs_db uses a different address space to the filesystem when it is
mounte dby the kernel, so the only way to keep them coherent is to
ensure that all buffered data is written to disk before the other
entity tries to read it. xfs_db uses buffered IO, but does not close
the devices when it exits, thereby leaving changes it has written in
the block device cache rather than on disk. Hence when th ekernel
tries to mount the filesystem, it reads what is on disk and does not
see xfs_db's changes.

Fix this by ensuring that xfs_db flushes it's changes to disk before
it exits by caling libxfs_device_close(). This fsyncs the data and
flushes the caches to ensure that it is present on disk before
xfs_db exits.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Mark Tinguely <tinguely@sgi.com>
Signed-off-by: Mark Tinguely <tinguely@sgi.com>

diff --git a/db/init.c b/db/init.c
index 2a5ef2b4f210221bf2163336a297305f49ab2895..2a31cb86c374c4c9b24b57e5eb7f63993a453c00 100644 (file)
--- a/db/init.c
+++ b/db/init.c
@@ -170,7 +170,7 @@ main(
        }
        if (cmdline) {
                xfree(cmdline);
-               return exitcode;
+               goto close_devices;
        }
 
        while (!done) {
@@ -181,5 +181,13 @@ main(
                        done = command(c, v);
                doneline(input, v);
        }
+
+close_devices:
+       if (x.ddev)
+               libxfs_device_close(x.ddev);
+       if (x.logdev && x.logdev != x.ddev)
+               libxfs_device_close(x.logdev);
+       if (x.rtdev)
+               libxfs_device_close(x.rtdev);
        return exitcode;
 }