Patched in Tegra support.

1 files changed, 5 insertions, 64 deletions

diff --git a/fs/btrfs/dir-item.c b/fs/btrfs/dir-item.c
index 502c2158167..31d84e78129 100644
--- a/fs/btrfs/dir-item.c
+++ b/fs/btrfs/dir-item.c
@@ -49,8 +49,9 @@ static struct btrfs_dir_item *insert_with_overflow(struct btrfs_trans_handle
                 di = btrfs_match_dir_item_name(root, path, name, name_len);
                 if (di)
                         return ERR_PTR(-EEXIST);
-                btrfs_extend_item(trans, root, path, data_size);
-        } else if (ret < 0)
+                ret = btrfs_extend_item(trans, root, path, data_size);
+        }
+        if (ret < 0)
                 return ERR_PTR(ret);
         WARN_ON(ret > 0);
         leaf = path->nodes[0];
@@ -115,7 +116,6 @@ int btrfs_insert_xattr_item(struct btrfs_trans_handle *trans,
  * 'location' is the key to stuff into the directory item, 'type' is the
  * type of the inode we're pointing to, and 'index' is the sequence number
  * to use for the second index (if one is created).
- * Will return 0 or -ENOMEM
  */
 int btrfs_insert_dir_item(struct btrfs_trans_handle *trans, struct btrfs_root
                           *root, const char *name, int name_len,
@@ -213,65 +213,6 @@ struct btrfs_dir_item *btrfs_lookup_dir_item(struct btrfs_trans_handle *trans,
         return btrfs_match_dir_item_name(root, path, name, name_len);
 }
 
-int btrfs_check_dir_item_collision(struct btrfs_root *root, u64 dir,
-                                   const char *name, int name_len)
-{
-        int ret;
-        struct btrfs_key key;
-        struct btrfs_dir_item *di;
-        int data_size;
-        struct extent_buffer *leaf;
-        int slot;
-        struct btrfs_path *path;
-
-
-        path = btrfs_alloc_path();
-        if (!path)
-                return -ENOMEM;
-
-        key.objectid = dir;
-        btrfs_set_key_type(&key, BTRFS_DIR_ITEM_KEY);
-        key.offset = btrfs_name_hash(name, name_len);
-
-        ret = btrfs_search_slot(NULL, root, &key, path, 0, 0);
-
-        /* return back any errors */
-        if (ret < 0)
-                goto out;
-
-        /* nothing found, we're safe */
-        if (ret > 0) {
-                ret = 0;
-                goto out;
-        }
-
-        /* we found an item, look for our name in the item */
-        di = btrfs_match_dir_item_name(root, path, name, name_len);
-        if (di) {
-                /* our exact name was found */
-                ret = -EEXIST;
-                goto out;
-        }
-
-        /*
-         * see if there is room in the item to insert this
-         * name
-         */
-        data_size = sizeof(*di) + name_len + sizeof(struct btrfs_item);
-        leaf = path->nodes[0];
-        slot = path->slots[0];
-        if (data_size + btrfs_item_size_nr(leaf, slot) +
-            sizeof(struct btrfs_item) > BTRFS_LEAF_DATA_SIZE(root)) {
-                ret = -EOVERFLOW;
-        } else {
-                /* plenty of insertion room */
-                ret = 0;
-        }
-out:
-        btrfs_free_path(path);
-        return ret;
-}
-
 /*
  * lookup a directory item based on index.  'dir' is the objectid
  * we're searching in, and 'mod' tells us if you plan on deleting the
@@ -442,8 +383,8 @@ int btrfs_delete_one_dir_name(struct btrfs_trans_handle *trans,
                 start = btrfs_item_ptr_offset(leaf, path->slots[0]);
                 memmove_extent_buffer(leaf, ptr, ptr + sub_item_len,
                         item_len - (ptr + sub_item_len - start));
-                btrfs_truncate_item(trans, root, path,
-                                    item_len - sub_item_len, 1);
+                ret = btrfs_truncate_item(trans, root, path,
+                                          item_len - sub_item_len, 1);
         }
         return ret;
 }