Re: [PATCH v1 1/3] btrfs: remove struct btrfs_root parameter where unused
Hi,
(2011/05/31 19:16), Arne Jansen wrote:
> The following functions had a struct btrfs_root * parameter which went
> unused:
>
> btrfs_set_block_group_rw
> btrfs_destroy_delayed_refs
> btrfs_csum_data
> extent_data_ref_count
> copy_to_sk
>
> Signed-off-by: Arne Jansen
> ---
> fs/btrfs/compression.c |3 +--
> fs/btrfs/ctree.c| 20 ++--
> fs/btrfs/ctree.h|5 +
> fs/btrfs/disk-io.c | 14 ++
> fs/btrfs/disk-io.h |2 +-
> fs/btrfs/extent-tree.c | 16 ++--
> fs/btrfs/file-item.c|3 +--
> fs/btrfs/free-space-cache.c |6 +++---
> fs/btrfs/inode.c|7 +++
> fs/btrfs/ioctl.c|5 ++---
> fs/btrfs/relocation.c |2 +-
> fs/btrfs/scrub.c|7 +++
> 12 files changed, 38 insertions(+), 52 deletions(-)
>
> diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
> index bfe42b0..2182cc5 100644
> --- a/fs/btrfs/compression.c
> +++ b/fs/btrfs/compression.c
> @@ -105,7 +105,6 @@ static int check_compressed_csum(struct inode *inode,
>u64 disk_start)
> {
> int ret;
> - struct btrfs_root *root = BTRFS_I(inode)->root;
> struct page *page;
> unsigned long i;
> char *kaddr;
> @@ -120,7 +119,7 @@ static int check_compressed_csum(struct inode *inode,
> csum = ~(u32)0;
>
> kaddr = kmap_atomic(page, KM_USER0);
> - csum = btrfs_csum_data(root, kaddr, csum, PAGE_CACHE_SIZE);
> + csum = btrfs_csum_data(kaddr, csum, PAGE_CACHE_SIZE);
> btrfs_csum_final(csum, (char *)&csum);
> kunmap_atomic(kaddr, KM_USER0);
>
> diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
> index b0e18d9..670bed7 100644
> --- a/fs/btrfs/ctree.c
> +++ b/fs/btrfs/ctree.c
> @@ -339,7 +339,7 @@ static noinline int update_ref_for_cow(struct
> btrfs_trans_handle *trans,
> BUG_ON(ret);
> }
> if (new_flags != 0) {
> - ret = btrfs_set_disk_extent_flags(trans, root,
> + ret = btrfs_set_disk_extent_flags(trans,
> buf->start,
> buf->len,
> new_flags, 0);
> @@ -1763,7 +1763,7 @@ done:
> * fixing up the blocks in ram so the tree is consistent.
> */
> static int fixup_low_keys(struct btrfs_trans_handle *trans,
> - struct btrfs_root *root, struct btrfs_path *path,
> + struct btrfs_path *path,
> struct btrfs_disk_key *key, int level)
'trans' is also unnecessary in fixup_low_keys().
(http://marc.info/?l=linux-btrfs&m=130337980625475&w=2)
Thanks,
Tsutomu
> {
> int i;
> @@ -1814,7 +1814,7 @@ int btrfs_set_item_key_safe(struct btrfs_trans_handle
> *trans,
> btrfs_set_item_key(eb, &disk_key, slot);
> btrfs_mark_buffer_dirty(eb);
> if (slot == 0)
> - fixup_low_keys(trans, root, path, &disk_key, 1);
> + fixup_low_keys(trans, path, &disk_key, 1);
> return 0;
> }
>
> @@ -2579,7 +2579,7 @@ static noinline int __push_leaf_left(struct
> btrfs_trans_handle *trans,
> clean_tree_block(trans, root, right);
>
> btrfs_item_key(right, &disk_key, 0);
> - wret = fixup_low_keys(trans, root, path, &disk_key, 1);
> + wret = fixup_low_keys(trans, path, &disk_key, 1);
> if (wret)
> ret = wret;
>
> @@ -2966,7 +2966,7 @@ again:
> path->nodes[0] = right;
> path->slots[0] = 0;
> if (path->slots[1] == 0) {
> - wret = fixup_low_keys(trans, root,
> + wret = fixup_low_keys(trans,
> path, &disk_key, 1);
> if (wret)
> ret = wret;
> @@ -3301,7 +3301,7 @@ int btrfs_truncate_item(struct btrfs_trans_handle
> *trans,
> btrfs_set_disk_key_offset(&disk_key, offset + size_diff);
> btrfs_set_item_key(leaf, &disk_key, slot);
> if (slot == 0)
> - fixup_low_keys(trans, root, path, &disk_key, 1);
> + fixup_low_keys(trans, path, &disk_key, 1);
> }
>
> item = btrfs_item_nr(leaf, slot);
> @@ -3532,7 +3532,7 @@ int btrfs_insert_some_items(struct btrfs_trans_handle
> *trans,
> ret = 0;
> if (slot == 0) {
> btrfs_cpu_key_to_disk(&disk_key, cpu_key);
> - ret = fixup_low_keys(trans, root, path, &disk_key, 1);
> + ret = fixup_low_keys(trans, path, &disk_key, 1);
> }
>
> if (btrfs_leaf_free_space(root, leaf) < 0) {
> @@ -3638,7 +3638,7 @@ int setup_items_for_insert(struct
[PATCH v1 1/3] btrfs: remove struct btrfs_root parameter where unused
The following functions had a struct btrfs_root * parameter which went
unused:
btrfs_set_block_group_rw
btrfs_destroy_delayed_refs
btrfs_csum_data
extent_data_ref_count
copy_to_sk
Signed-off-by: Arne Jansen
---
fs/btrfs/compression.c |3 +--
fs/btrfs/ctree.c| 20 ++--
fs/btrfs/ctree.h|5 +
fs/btrfs/disk-io.c | 14 ++
fs/btrfs/disk-io.h |2 +-
fs/btrfs/extent-tree.c | 16 ++--
fs/btrfs/file-item.c|3 +--
fs/btrfs/free-space-cache.c |6 +++---
fs/btrfs/inode.c|7 +++
fs/btrfs/ioctl.c|5 ++---
fs/btrfs/relocation.c |2 +-
fs/btrfs/scrub.c|7 +++
12 files changed, 38 insertions(+), 52 deletions(-)
diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
index bfe42b0..2182cc5 100644
--- a/fs/btrfs/compression.c
+++ b/fs/btrfs/compression.c
@@ -105,7 +105,6 @@ static int check_compressed_csum(struct inode *inode,
u64 disk_start)
{
int ret;
- struct btrfs_root *root = BTRFS_I(inode)->root;
struct page *page;
unsigned long i;
char *kaddr;
@@ -120,7 +119,7 @@ static int check_compressed_csum(struct inode *inode,
csum = ~(u32)0;
kaddr = kmap_atomic(page, KM_USER0);
- csum = btrfs_csum_data(root, kaddr, csum, PAGE_CACHE_SIZE);
+ csum = btrfs_csum_data(kaddr, csum, PAGE_CACHE_SIZE);
btrfs_csum_final(csum, (char *)&csum);
kunmap_atomic(kaddr, KM_USER0);
diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
index b0e18d9..670bed7 100644
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
@@ -339,7 +339,7 @@ static noinline int update_ref_for_cow(struct
btrfs_trans_handle *trans,
BUG_ON(ret);
}
if (new_flags != 0) {
- ret = btrfs_set_disk_extent_flags(trans, root,
+ ret = btrfs_set_disk_extent_flags(trans,
buf->start,
buf->len,
new_flags, 0);
@@ -1763,7 +1763,7 @@ done:
* fixing up the blocks in ram so the tree is consistent.
*/
static int fixup_low_keys(struct btrfs_trans_handle *trans,
- struct btrfs_root *root, struct btrfs_path *path,
+ struct btrfs_path *path,
struct btrfs_disk_key *key, int level)
{
int i;
@@ -1814,7 +1814,7 @@ int btrfs_set_item_key_safe(struct btrfs_trans_handle
*trans,
btrfs_set_item_key(eb, &disk_key, slot);
btrfs_mark_buffer_dirty(eb);
if (slot == 0)
- fixup_low_keys(trans, root, path, &disk_key, 1);
+ fixup_low_keys(trans, path, &disk_key, 1);
return 0;
}
@@ -2579,7 +2579,7 @@ static noinline int __push_leaf_left(struct
btrfs_trans_handle *trans,
clean_tree_block(trans, root, right);
btrfs_item_key(right, &disk_key, 0);
- wret = fixup_low_keys(trans, root, path, &disk_key, 1);
+ wret = fixup_low_keys(trans, path, &disk_key, 1);
if (wret)
ret = wret;
@@ -2966,7 +2966,7 @@ again:
path->nodes[0] = right;
path->slots[0] = 0;
if (path->slots[1] == 0) {
- wret = fixup_low_keys(trans, root,
+ wret = fixup_low_keys(trans,
path, &disk_key, 1);
if (wret)
ret = wret;
@@ -3301,7 +3301,7 @@ int btrfs_truncate_item(struct btrfs_trans_handle *trans,
btrfs_set_disk_key_offset(&disk_key, offset + size_diff);
btrfs_set_item_key(leaf, &disk_key, slot);
if (slot == 0)
- fixup_low_keys(trans, root, path, &disk_key, 1);
+ fixup_low_keys(trans, path, &disk_key, 1);
}
item = btrfs_item_nr(leaf, slot);
@@ -3532,7 +3532,7 @@ int btrfs_insert_some_items(struct btrfs_trans_handle
*trans,
ret = 0;
if (slot == 0) {
btrfs_cpu_key_to_disk(&disk_key, cpu_key);
- ret = fixup_low_keys(trans, root, path, &disk_key, 1);
+ ret = fixup_low_keys(trans, path, &disk_key, 1);
}
if (btrfs_leaf_free_space(root, leaf) < 0) {
@@ -3638,7 +3638,7 @@ int setup_items_for_insert(struct btrfs_trans_handle
*trans,
ret = 0;
if (slot == 0) {
btrfs_cpu_key_to_disk(&disk_key, cpu_key);
- ret = fixup_low_keys(trans, root, path, &disk_key, 1);
+ ret = fixup_low_keys(trans, path, &disk_key, 1);
}
btrfs_unl
