btrfs-progs: check: introduce function to check dir_item

[platform/upstream/btrfs-progs.git] / extent_io.c

diff --git a/extent_io.c b/extent_io.c
index 66aa214..7b9eb8e 100644 (file)
--- a/extent_io.c
+++ b/extent_io.c
@@ -27,6 +27,7 @@
 #include "list.h"
 #include "ctree.h"
 #include "volumes.h"
+#include "internal.h"
 
 void extent_io_tree_init(struct extent_io_tree *tree)
 {
@@ -538,12 +539,9 @@ static struct extent_buffer *__alloc_extent_buffer(struct extent_io_tree *tree,
 {
        struct extent_buffer *eb;
 
-       eb = malloc(sizeof(struct extent_buffer) + blocksize);
-       if (!eb) {
-               BUG();
+       eb = calloc(1, sizeof(struct extent_buffer) + blocksize);
+       if (!eb)
                return NULL;
-       }
-       memset(eb, 0, sizeof(struct extent_buffer) + blocksize);
 
        eb->start = bytenr;
        eb->len = blocksize;
@@ -564,7 +562,7 @@ struct extent_buffer *btrfs_clone_extent_buffer(struct extent_buffer *src)
        struct extent_buffer *new;
 
        new = __alloc_extent_buffer(NULL, src->start, src->len);
-       if (new == NULL)
+       if (!new)
                return NULL;
 
        copy_extent_buffer(new, src, 0, 0, src->len);
@@ -714,7 +712,7 @@ int read_data_from_disk(struct btrfs_fs_info *info, void *buf, u64 offset,
                device = multi->stripes[0].dev;
 
                read_len = min(bytes_left, read_len);
-               if (device->fd == 0) {
+               if (device->fd <= 0) {
                        kfree(multi);
                        return -EIO;
                }
@@ -771,10 +769,14 @@ int write_data_to_disk(struct btrfs_fs_info *info, void *buf, u64 offset,
                        u64 stripe_len = this_len;
 
                        this_len = min(this_len, bytes_left);
-                       this_len = min(this_len, (u64)info->tree_root->leafsize);
+                       this_len = min(this_len, (u64)info->tree_root->nodesize);
 
                        eb = malloc(sizeof(struct extent_buffer) + this_len);
-                       BUG_ON(!eb);
+                       if (!eb) {
+                               fprintf(stderr, "cannot allocate memory for eb\n");
+                               ret = -ENOMEM;
+                               goto out;
+                       }
 
                        memset(eb, 0, sizeof(struct extent_buffer) + this_len);
                        eb->start = offset;
@@ -790,7 +792,7 @@ int write_data_to_disk(struct btrfs_fs_info *info, void *buf, u64 offset,
                        raid_map = NULL;
                } else while (dev_nr < multi->num_stripes) {
                        device = multi->stripes[dev_nr].dev;
-                       if (device->fd == 0) {
+                       if (device->fd <= 0) {
                                kfree(multi);
                                return -EIO;
                        }
@@ -825,29 +827,10 @@ int write_data_to_disk(struct btrfs_fs_info *info, void *buf, u64 offset,
                multi = NULL;
        }
        return 0;
-}
-
-
-int set_extent_buffer_uptodate(struct extent_buffer *eb)
-{
-       eb->flags |= EXTENT_UPTODATE;
-       return 0;
-}
-
-int clear_extent_buffer_uptodate(struct extent_io_tree *tree,
-                               struct extent_buffer *eb)
-{
-       eb->flags &= ~EXTENT_UPTODATE;
-       return 0;
-}
 
-int extent_buffer_uptodate(struct extent_buffer *eb)
-{
-       if (!eb || IS_ERR(eb))
-               return 0;
-       if (eb->flags & EXTENT_UPTODATE)
-               return 1;
-       return 0;
+out:
+       kfree(raid_map);
+       return ret;
 }
 
 int set_extent_buffer_dirty(struct extent_buffer *eb)
@@ -908,3 +891,9 @@ void memset_extent_buffer(struct extent_buffer *eb, char c,
 {
        memset(eb->data + start, c, len);
 }
+
+int extent_buffer_test_bit(struct extent_buffer *eb, unsigned long start,
+                          unsigned long nr)
+{
+       return le_test_bit(nr, (u8 *)eb->data + start);
+}