btrfs: remove constant parameter to memset_extent_buffer and rename it

The only memset we do is to 0, so sink the parameter to the function and
simplify all calls. Rename the function to reflect the behaviour.

Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
index 93bc38b98b3fa8f740a023e455f2e52b1f47e858..be362b776138e909687d2189800e9a20bd0c83dd 100644 (file)
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
@@ -3348,7 +3348,7 @@ static noinline int insert_new_root(struct btrfs_trans_handle *trans,
 
        root_add_used(root, root->nodesize);
 
-       memset_extent_buffer(c, 0, 0, sizeof(struct btrfs_header));
+       memzero_extent_buffer(c, 0, sizeof(struct btrfs_header));
        btrfs_set_header_nritems(c, 1);
        btrfs_set_header_level(c, level);
        btrfs_set_header_bytenr(c, c->start);
@@ -3484,7 +3484,7 @@ static noinline int split_node(struct btrfs_trans_handle *trans,
 
        root_add_used(root, root->nodesize);
 
-       memset_extent_buffer(split, 0, 0, sizeof(struct btrfs_header));
+       memzero_extent_buffer(split, 0, sizeof(struct btrfs_header));
        btrfs_set_header_level(split, btrfs_header_level(c));
        btrfs_set_header_bytenr(split, split->start);
        btrfs_set_header_generation(split, trans->transid);
@@ -4270,7 +4270,7 @@ static noinline int split_leaf(struct btrfs_trans_handle *trans,
 
        root_add_used(root, root->nodesize);
 
-       memset_extent_buffer(right, 0, 0, sizeof(struct btrfs_header));
+       memzero_extent_buffer(right, 0, sizeof(struct btrfs_header));
        btrfs_set_header_bytenr(right, right->start);
        btrfs_set_header_generation(right, trans->transid);
        btrfs_set_header_backref_rev(right, BTRFS_MIXED_BACKREF_REV);

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 21f8e597fe977557dca8256e14697d74b1aa585e..5d1da78f044b0167d8df36756903a33070e4535d 100644 (file)
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -1412,7 +1412,7 @@ struct btrfs_root *btrfs_create_tree(struct btrfs_trans_handle *trans,
                goto fail;
        }
 
-       memset_extent_buffer(leaf, 0, 0, sizeof(struct btrfs_header));
+       memzero_extent_buffer(leaf, 0, sizeof(struct btrfs_header));
        btrfs_set_header_bytenr(leaf, leaf->start);
        btrfs_set_header_generation(leaf, trans->transid);
        btrfs_set_header_backref_rev(leaf, BTRFS_MIXED_BACKREF_REV);
@@ -1496,7 +1496,7 @@ static struct btrfs_root *alloc_log_tree(struct btrfs_trans_handle *trans,
                return ERR_CAST(leaf);
        }
 
-       memset_extent_buffer(leaf, 0, 0, sizeof(struct btrfs_header));
+       memzero_extent_buffer(leaf, 0, sizeof(struct btrfs_header));
        btrfs_set_header_bytenr(leaf, leaf->start);
        btrfs_set_header_generation(leaf, trans->transid);
        btrfs_set_header_backref_rev(leaf, BTRFS_MIXED_BACKREF_REV);

diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 39a834d217499a8fdc04754c453e25bff47634ec..78fcc67e7b8c5263669bd50330a8365ccfcff5ae 100644 (file)
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -1114,7 +1114,7 @@ static int convert_extent_item_v0(struct btrfs_trans_handle *trans,
                                       BTRFS_BLOCK_FLAG_FULL_BACKREF);
                bi = (struct btrfs_tree_block_info *)(item + 1);
                /* FIXME: get first key of the block */
-               memset_extent_buffer(leaf, 0, (unsigned long)bi, sizeof(*bi));
+               memzero_extent_buffer(leaf, (unsigned long)bi, sizeof(*bi));
                btrfs_set_tree_block_level(leaf, bi, (int)owner);
        } else {
                btrfs_set_extent_flags(leaf, item, BTRFS_EXTENT_FLAG_DATA);

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index bf719e3bcaf25a67af3ccd5834417c885cda8525..9f8a1a331c6128fdeeb42a9115c8130f45a52bfe 100644 (file)
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -3743,7 +3743,7 @@ static noinline_for_stack int write_one_eb(struct extent_buffer *eb,
        if (btrfs_header_level(eb) > 0) {
                end = btrfs_node_key_ptr_offset(nritems);
 
-               memset_extent_buffer(eb, 0, end, eb->len - end);
+               memzero_extent_buffer(eb, end, eb->len - end);
        } else {
                /*
                 * leaf:
@@ -3752,7 +3752,7 @@ static noinline_for_stack int write_one_eb(struct extent_buffer *eb,
                start = btrfs_item_nr_offset(nritems);
                end = btrfs_leaf_data(eb) +
                      leaf_data_end(fs_info->tree_root, eb);
-               memset_extent_buffer(eb, 0, start, end - start);
+               memzero_extent_buffer(eb, start, end - start);
        }
 
        for (i = 0; i < num_pages; i++) {
@@ -5517,8 +5517,8 @@ void write_extent_buffer(struct extent_buffer *eb, const void *srcv,
        }
 }
 
-void memset_extent_buffer(struct extent_buffer *eb, char c,
-                         unsigned long start, unsigned long len)
+void memzero_extent_buffer(struct extent_buffer *eb, unsigned long start,
+               unsigned long len)
 {
        size_t cur;
        size_t offset;
@@ -5538,7 +5538,7 @@ void memset_extent_buffer(struct extent_buffer *eb, char c,
 
                cur = min(len, PAGE_SIZE - offset);
                kaddr = page_address(page);
-               memset(kaddr + offset, c, cur);
+               memset(kaddr + offset, 0, cur);
 
                len -= cur;
                offset = 0;

diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h
index 065c77d43921a3b36a41773a20ea6a5fa016d7e4..12fe17523df259a52d1de356819d521c271a0524 100644 (file)
--- a/fs/btrfs/extent_io.h
+++ b/fs/btrfs/extent_io.h
@@ -417,8 +417,8 @@ void memcpy_extent_buffer(struct extent_buffer *dst, unsigned long dst_offset,
                           unsigned long src_offset, unsigned long len);
 void memmove_extent_buffer(struct extent_buffer *dst, unsigned long dst_offset,
                           unsigned long src_offset, unsigned long len);
-void memset_extent_buffer(struct extent_buffer *eb, char c,
-                         unsigned long start, unsigned long len);
+void memzero_extent_buffer(struct extent_buffer *eb, unsigned long start,
+                          unsigned long len);
 int extent_buffer_test_bit(struct extent_buffer *eb, unsigned long start,
                           unsigned long pos);
 void extent_buffer_bitmap_set(struct extent_buffer *eb, unsigned long start,

diff --git a/fs/btrfs/file-item.c b/fs/btrfs/file-item.c
index d0d571c47d33b8e876aa1906097678350a2ef74b..43418c08b110e134e4ccccb807d9b56be71e406b 100644 (file)
--- a/fs/btrfs/file-item.c
+++ b/fs/btrfs/file-item.c
@@ -689,7 +689,7 @@ int btrfs_del_csums(struct btrfs_trans_handle *trans,
                        item_offset = btrfs_item_ptr_offset(leaf,
                                                            path->slots[0]);
 
-                       memset_extent_buffer(leaf, 0, item_offset + offset,
+                       memzero_extent_buffer(leaf, item_offset + offset,
                                             shift_len);
                        key.offset = bytenr;
 

diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c
index e4b48f377d3a9110542872c56ddbb3933e6d4a75..a754865b3cb1efcdf19a0d2eeab4508a9d7d7fb5 100644 (file)
--- a/fs/btrfs/free-space-cache.c
+++ b/fs/btrfs/free-space-cache.c
@@ -153,7 +153,7 @@ static int __create_free_space_inode(struct btrfs_root *root,
        inode_item = btrfs_item_ptr(leaf, path->slots[0],
                                    struct btrfs_inode_item);
        btrfs_item_key(leaf, &disk_key, path->slots[0]);
-       memset_extent_buffer(leaf, 0, (unsigned long)inode_item,
+       memzero_extent_buffer(leaf, (unsigned long)inode_item,
                             sizeof(*inode_item));
        btrfs_set_inode_generation(leaf, inode_item, trans->transid);
        btrfs_set_inode_size(leaf, inode_item, 0);
@@ -181,7 +181,7 @@ static int __create_free_space_inode(struct btrfs_root *root,
        leaf = path->nodes[0];
        header = btrfs_item_ptr(leaf, path->slots[0],
                                struct btrfs_free_space_header);
-       memset_extent_buffer(leaf, 0, (unsigned long)header, sizeof(*header));
+       memzero_extent_buffer(leaf, (unsigned long)header, sizeof(*header));
        btrfs_set_free_space_key(leaf, header, &disk_key);
        btrfs_mark_buffer_dirty(leaf);
        btrfs_release_path(path);

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 81aba7d2006112fa036423115b8ac8267413adde..06dc95caa6f17d9ad5c326d503b7e16b13d8a62f 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -6276,7 +6276,7 @@ static struct inode *btrfs_new_inode(struct btrfs_trans_handle *trans,
 
        inode_item = btrfs_item_ptr(path->nodes[0], path->slots[0],
                                  struct btrfs_inode_item);
-       memset_extent_buffer(path->nodes[0], 0, (unsigned long)inode_item,
+       memzero_extent_buffer(path->nodes[0], (unsigned long)inode_item,
                             sizeof(*inode_item));
        fill_inode_item(trans, path->nodes[0], inode_item, inode);
 

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index 24f04d7cb8727bd2d58684fdd227ac9f568259fa..a26202ebed33c2e53b35c95d8f64e1e3369dc222 100644 (file)
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -501,7 +501,7 @@ static noinline int create_subvol(struct inode *dir,
                goto fail;
        }
 
-       memset_extent_buffer(leaf, 0, 0, sizeof(struct btrfs_header));
+       memzero_extent_buffer(leaf, 0, sizeof(struct btrfs_header));
        btrfs_set_header_bytenr(leaf, leaf->start);
        btrfs_set_header_generation(leaf, trans->transid);
        btrfs_set_header_backref_rev(leaf, BTRFS_MIXED_BACKREF_REV);

diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index d8d450ae9e90cbf5c38dfd224f985ccfde8162bf..26f6c5ac879ea5381fd7ed3b893ee2db5bbfc148 100644 (file)
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -4255,7 +4255,7 @@ static int __insert_orphan_inode(struct btrfs_trans_handle *trans,
 
        leaf = path->nodes[0];
        item = btrfs_item_ptr(leaf, path->slots[0], struct btrfs_inode_item);
-       memset_extent_buffer(leaf, 0, (unsigned long)item, sizeof(*item));
+       memzero_extent_buffer(leaf, (unsigned long)item, sizeof(*item));
        btrfs_set_inode_generation(leaf, item, 1);
        btrfs_set_inode_size(leaf, item, 0);
        btrfs_set_inode_mode(leaf, item, S_IFREG | 0600);

diff --git a/fs/btrfs/tests/extent-io-tests.c b/fs/btrfs/tests/extent-io-tests.c
index caad80bb9bd0116072af62a8aae96bac86db4c51..2c7a0a9225101587194c30ce390588e14bf1db3c 100644 (file)
--- a/fs/btrfs/tests/extent-io-tests.c
+++ b/fs/btrfs/tests/extent-io-tests.c
@@ -306,7 +306,7 @@ static int __test_eb_bitmaps(unsigned long *bitmap, struct extent_buffer *eb,
        int ret;
 
        memset(bitmap, 0, len);
-       memset_extent_buffer(eb, 0, 0, len);
+       memzero_extent_buffer(eb, 0, len);
        if (memcmp_extent_buffer(eb, bitmap, 0, len) != 0) {
                test_msg("Bitmap was not zeroed\n");
                return -EINVAL;

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 7eebf556feb7da1f18fdedf856a6f65edf9c93ed..1886b94f13aca32479feb254c7cdca9489d81b70 100644 (file)
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -3062,7 +3062,7 @@ static int insert_balance_item(struct btrfs_root *root,
        leaf = path->nodes[0];
        item = btrfs_item_ptr(leaf, path->slots[0], struct btrfs_balance_item);
 
-       memset_extent_buffer(leaf, 0, (unsigned long)item, sizeof(*item));
+       memzero_extent_buffer(leaf, (unsigned long)item, sizeof(*item));
 
        btrfs_cpu_balance_args_to_disk(&disk_bargs, &bctl->data);
        btrfs_set_balance_data(leaf, item, &disk_bargs);