btrfs-progs: convert: Fix a bug which fails to insert hole file extent

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

diff --git a/extent_io.c b/extent_io.c
index 425af8a..c99d362 100644 (file)
--- a/extent_io.c
+++ b/extent_io.c
@@ -16,8 +16,6 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 021110-1307, USA.
  */
-#define _XOPEN_SOURCE 600
-#define __USE_XOPEN2K
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>
@@ -29,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)
 {
@@ -539,14 +538,12 @@ static struct extent_buffer *__alloc_extent_buffer(struct extent_io_tree *tree,
                                                   u64 bytenr, u32 blocksize)
 {
        struct extent_buffer *eb;
-       int ret;
 
-       eb = malloc(sizeof(struct extent_buffer) + blocksize);
+       eb = calloc(1, sizeof(struct extent_buffer) + blocksize);
        if (!eb) {
                BUG();
                return NULL;
        }
-       memset(eb, 0, sizeof(struct extent_buffer) + blocksize);
 
        eb->start = bytenr;
        eb->len = blocksize;
@@ -559,19 +556,26 @@ static struct extent_buffer *__alloc_extent_buffer(struct extent_io_tree *tree,
        eb->cache_node.size = blocksize;
        INIT_LIST_HEAD(&eb->recow);
 
-       ret = insert_cache_extent(&tree->cache, &eb->cache_node);
-       if (ret) {
-               free(eb);
-               return NULL;
-       }
-       list_add_tail(&eb->lru, &tree->lru);
-       tree->cache_size += blocksize;
        return eb;
 }
 
+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)
+               return NULL;
+
+       copy_extent_buffer(new, src, 0, 0, src->len);
+       new->flags |= EXTENT_BUFFER_DUMMY;
+
+       return new;
+}
+
 void free_extent_buffer(struct extent_buffer *eb)
 {
-       if (!eb)
+       if (!eb || IS_ERR(eb))
                return;
 
        eb->refs--;
@@ -581,9 +585,11 @@ void free_extent_buffer(struct extent_buffer *eb)
                BUG_ON(eb->flags & EXTENT_DIRTY);
                list_del_init(&eb->lru);
                list_del_init(&eb->recow);
-               remove_cache_extent(&tree->cache, &eb->cache_node);
-               BUG_ON(tree->cache_size < eb->len);
-               tree->cache_size -= eb->len;
+               if (!(eb->flags & EXTENT_BUFFER_DUMMY)) {
+                       BUG_ON(tree->cache_size < eb->len);
+                       remove_cache_extent(&tree->cache, &eb->cache_node);
+                       tree->cache_size -= eb->len;
+               }
                free(eb);
        }
 }
@@ -632,12 +638,23 @@ struct extent_buffer *alloc_extent_buffer(struct extent_io_tree *tree,
                list_move_tail(&eb->lru, &tree->lru);
                eb->refs++;
        } else {
+               int ret;
+
                if (cache) {
                        eb = container_of(cache, struct extent_buffer,
                                          cache_node);
                        free_extent_buffer(eb);
                }
                eb = __alloc_extent_buffer(tree, bytenr, blocksize);
+               if (!eb)
+                       return NULL;
+               ret = insert_cache_extent(&tree->cache, &eb->cache_node);
+               if (ret) {
+                       free(eb);
+                       return NULL;
+               }
+               list_add_tail(&eb->lru, &tree->lru);
+               tree->cache_size += blocksize;
        }
        return eb;
 }
@@ -647,8 +664,10 @@ int read_extent_from_disk(struct extent_buffer *eb,
 {
        int ret;
        ret = pread(eb->fd, eb->data + offset, len, eb->dev_bytenr);
-       if (ret < 0)
+       if (ret < 0) {
+               ret = -errno;
                goto out;
+       }
        if (ret != len) {
                ret = -EIO;
                goto out;
@@ -695,7 +714,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;
                }
@@ -752,7 +771,7 @@ 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);
@@ -771,7 +790,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;
                        }
@@ -808,30 +827,6 @@ int write_data_to_disk(struct btrfs_fs_info *info, void *buf, u64 offset,
        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)
-               return 0;
-
-       if (eb->flags & EXTENT_UPTODATE)
-               return 1;
-       return 0;
-}
-
 int set_extent_buffer_dirty(struct extent_buffer *eb)
 {
        struct extent_io_tree *tree = eb->tree;
@@ -890,3 +885,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 test_bit(nr, (unsigned long *)(eb->data + start));
+}