]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
hfsplus: rework processing errors in hfsplus_free_extents()
authorVyacheslav Dubeyko <slava@dubeyko.com>
Thu, 20 Dec 2012 23:05:25 +0000 (15:05 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 21 Dec 2012 01:40:19 +0000 (17:40 -0800)
Currently, it doesn't process error codes from the hfsplus_block_free()
call in hfsplus_free_extents() method.  Add some error code processing.

Signed-off-by: Vyacheslav Dubeyko <slava@dubeyko.com>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Hin-Tak Leung <htl10@users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
fs/hfsplus/extents.c

index 5849e3ef35cc9bdce0ddccbdf5186aafdf4fdee9..eba76eab6d625f68aadcba26f04c001040b244c2 100644 (file)
@@ -329,6 +329,7 @@ static int hfsplus_free_extents(struct super_block *sb,
 {
        u32 count, start;
        int i;
 {
        u32 count, start;
        int i;
+       int err = 0;
 
        hfsplus_dump_extent(extent);
        for (i = 0; i < 8; extent++, i++) {
 
        hfsplus_dump_extent(extent);
        for (i = 0; i < 8; extent++, i++) {
@@ -345,18 +346,33 @@ found:
        for (;;) {
                start = be32_to_cpu(extent->start_block);
                if (count <= block_nr) {
        for (;;) {
                start = be32_to_cpu(extent->start_block);
                if (count <= block_nr) {
-                       hfsplus_block_free(sb, start, count);
+                       err = hfsplus_block_free(sb, start, count);
+                       if (err) {
+                               printk(KERN_ERR "hfs: can't free extent\n");
+                               dprint(DBG_EXTENT, " start: %u count: %u\n",
+                                       start, count);
+                       }
                        extent->block_count = 0;
                        extent->start_block = 0;
                        block_nr -= count;
                } else {
                        count -= block_nr;
                        extent->block_count = 0;
                        extent->start_block = 0;
                        block_nr -= count;
                } else {
                        count -= block_nr;
-                       hfsplus_block_free(sb, start + count, block_nr);
+                       err = hfsplus_block_free(sb, start + count, block_nr);
+                       if (err) {
+                               printk(KERN_ERR "hfs: can't free extent\n");
+                               dprint(DBG_EXTENT, " start: %u count: %u\n",
+                                       start, count);
+                       }
                        extent->block_count = cpu_to_be32(count);
                        block_nr = 0;
                }
                        extent->block_count = cpu_to_be32(count);
                        block_nr = 0;
                }
-               if (!block_nr || !i)
-                       return 0;
+               if (!block_nr || !i) {
+                       /*
+                        * Try to free all extents and
+                        * return only last error
+                        */
+                       return err;
+               }
                i--;
                extent--;
                count = be32_to_cpu(extent->block_count);
                i--;
                extent--;
                count = be32_to_cpu(extent->block_count);