aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorStefan Behrens <sbehrens@giantdisaster.de>2013-04-19 11:08:04 -0400
committerJosef Bacik <jbacik@fusionio.com>2013-05-06 15:55:14 -0400
commit5fbf83c10c323cbee61483a06ea61883e3c83e6b (patch)
tree9308c3c9f30d11d3fdd2513ce119bd073d7c46f3 /fs
parentecc7ada77b5cd1ac525db8f7d4d266e88af66cc7 (diff)
Btrfs: delete unused parameter to btrfs_read_root_item()
Signed-off-by: Stefan Behrens <sbehrens@giantdisaster.de> Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/btrfs/ctree.h5
-rw-r--r--fs/btrfs/disk-io.c2
-rw-r--r--fs/btrfs/root-tree.c7
3 files changed, 6 insertions, 8 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 974687808153..37c4da3403d0 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -3359,9 +3359,8 @@ int __must_check btrfs_update_root(struct btrfs_trans_handle *trans,
3359 struct btrfs_root *root, 3359 struct btrfs_root *root,
3360 struct btrfs_key *key, 3360 struct btrfs_key *key,
3361 struct btrfs_root_item *item); 3361 struct btrfs_root_item *item);
3362void btrfs_read_root_item(struct btrfs_root *root, 3362void btrfs_read_root_item(struct extent_buffer *eb, int slot,
3363 struct extent_buffer *eb, int slot, 3363 struct btrfs_root_item *item);
3364 struct btrfs_root_item *item);
3365int btrfs_find_last_root(struct btrfs_root *root, u64 objectid, struct 3364int btrfs_find_last_root(struct btrfs_root *root, u64 objectid, struct
3366 btrfs_root_item *item, struct btrfs_key *key); 3365 btrfs_root_item *item, struct btrfs_key *key);
3367int btrfs_find_dead_roots(struct btrfs_root *root, u64 objectid); 3366int btrfs_find_dead_roots(struct btrfs_root *root, u64 objectid);
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 84c4fa503ef5..a03a96650548 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -1481,7 +1481,7 @@ struct btrfs_root *btrfs_read_fs_root_no_radix(struct btrfs_root *tree_root,
1481 if (ret == 0) { 1481 if (ret == 0) {
1482 l = path->nodes[0]; 1482 l = path->nodes[0];
1483 slot = path->slots[0]; 1483 slot = path->slots[0];
1484 btrfs_read_root_item(tree_root, l, slot, &root->root_item); 1484 btrfs_read_root_item(l, slot, &root->root_item);
1485 memcpy(&root->root_key, location, sizeof(*location)); 1485 memcpy(&root->root_key, location, sizeof(*location));
1486 } 1486 }
1487 btrfs_free_path(path); 1487 btrfs_free_path(path);
diff --git a/fs/btrfs/root-tree.c b/fs/btrfs/root-tree.c
index 668af537a3ea..5bf1ed57f178 100644
--- a/fs/btrfs/root-tree.c
+++ b/fs/btrfs/root-tree.c
@@ -29,9 +29,8 @@
29 * generation numbers as then we know the root was once mounted with an older 29 * generation numbers as then we know the root was once mounted with an older
30 * kernel that was not aware of the root item structure change. 30 * kernel that was not aware of the root item structure change.
31 */ 31 */
32void btrfs_read_root_item(struct btrfs_root *root, 32void btrfs_read_root_item(struct extent_buffer *eb, int slot,
33 struct extent_buffer *eb, int slot, 33 struct btrfs_root_item *item)
34 struct btrfs_root_item *item)
35{ 34{
36 uuid_le uuid; 35 uuid_le uuid;
37 int len; 36 int len;
@@ -104,7 +103,7 @@ int btrfs_find_last_root(struct btrfs_root *root, u64 objectid,
104 goto out; 103 goto out;
105 } 104 }
106 if (item) 105 if (item)
107 btrfs_read_root_item(root, l, slot, item); 106 btrfs_read_root_item(l, slot, item);
108 if (key) 107 if (key)
109 memcpy(key, &found_key, sizeof(found_key)); 108 memcpy(key, &found_key, sizeof(found_key));
110 109