Move nodes flush from exfat_flush() into a separate function.

[android-x86/external-exfat.git] / libexfat / cluster.c

diff --git a/libexfat/cluster.c b/libexfat/cluster.c
index b4189c6..fc3657b 100644 (file)
--- a/libexfat/cluster.c
+++ b/libexfat/cluster.c
@@ -3,7 +3,7 @@
        exFAT file system implementation library.
 
        Free exFAT implementation.
-       Copyright (C) 2010-2013  Andrew Nayenko
+       Copyright (C) 2010-2015  Andrew Nayenko
 
        This program is free software; you can redistribute it and/or modify
        it under the terms of the GNU General Public License as published by
@@ -83,9 +83,9 @@ cluster_t exfat_next_cluster(const struct exfat* ef,
                return cluster + 1;
        fat_offset = s2o(ef, le32_to_cpu(ef->sb->fat_sector_start))
                + cluster * sizeof(cluster_t);
-       /* FIXME handle I/O error */
        if (exfat_pread(ef->dev, &next, sizeof(next), fat_offset) < 0)
-               exfat_bug("failed to read the next cluster after %#x", cluster);
+               return EXFAT_CLUSTER_BAD; /* the caller should handle this and print
+                                            appropriate error message */
        return le32_to_cpu(next);
 }
 
@@ -136,17 +136,39 @@ static cluster_t find_bit_and_set(bitmap_t* bitmap, size_t start, size_t end)
        return EXFAT_CLUSTER_END;
 }
 
-void exfat_flush(struct exfat* ef)
+static int flush_nodes(struct exfat* ef, struct exfat_node* node)
+{
+       struct exfat_node* p;
+
+       for (p = node->child; p != NULL; p = p->next)
+       {
+               int rc = flush_nodes(ef, p);
+               if (rc != 0)
+                       return rc;
+       }
+       return exfat_flush_node(ef, node);
+}
+
+int exfat_flush_nodes(struct exfat* ef)
+{
+       return flush_nodes(ef, ef->root);
+}
+
+int exfat_flush(struct exfat* ef)
 {
        if (ef->cmap.dirty)
        {
-               /* FIXME handle I/O error */
                if (exfat_pwrite(ef->dev, ef->cmap.chunk,
                                BMAP_SIZE(ef->cmap.chunk_size),
                                exfat_c2o(ef, ef->cmap.start_cluster)) < 0)
-                       exfat_bug("failed to write clusters bitmap");
+               {
+                       exfat_error("failed to write clusters bitmap");
+                       return -EIO;
+               }
                ef->cmap.dirty = false;
        }
+
+       return 0;
 }
 
 static bool set_next_cluster(const struct exfat* ef, bool contiguous,
@@ -313,6 +335,7 @@ static int shrink_file(struct exfat* ef, struct exfat_node* node,
        {
                previous = node->start_cluster;
                node->start_cluster = EXFAT_CLUSTER_FREE;
+               node->flags |= EXFAT_ATTRIB_DIRTY;
        }
        node->fptr_index = 0;
        node->fptr_cluster = node->start_cluster;