2 files changed, 7 insertions, 5 deletions

diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
index dd1c03aea2df..71ef0a2e2daa 100644
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
@@ -3041,7 +3041,6 @@ int btrfs_insert_some_items(struct btrfs_trans_handle *trans,
         struct btrfs_item *item;
         int ret = 0;
         int slot;
-        int slot_orig;
         int i;
         u32 nritems;
         u32 total_data = 0;
@@ -3064,7 +3063,6 @@ int btrfs_insert_some_items(struct btrfs_trans_handle *trans,
         if (ret < 0)
                 goto out;
 
-        slot_orig = path->slots[0];
         leaf = path->nodes[0];
 
         nritems = btrfs_header_nritems(leaf);
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index b0f2241274fd..1121d518bf8c 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -798,9 +798,12 @@ static int noinline insert_extents(struct btrfs_trans_handle *trans,
                          */
                         i = last;
                         last = 0;
-                        cur = insert_list->next;
-                        op = list_entry(cur, struct pending_extent_op, list);
                         total--;
+                        if (i < total) {
+                                cur = insert_list->next;
+                                op = list_entry(cur, struct pending_extent_op,
+                                                list);
+                        }
                 } else {
                         i += ret;
                 }
@@ -2150,6 +2153,7 @@ again:
                 if (ret) {
                         if (skipped && all && !num_inserts) {
                                 skipped = 0;
+                                search = 0;
                                 continue;
                         }
                         mutex_unlock(&info->extent_ins_mutex);
@@ -2189,7 +2193,7 @@ again:
         }
 
         /*
-         * process teh update list, clear the writeback bit for it, and if
+         * process the update list, clear the writeback bit for it, and if
          * somebody marked this thing for deletion then just unlock it and be
          * done, the free_extents will handle it
          */