btrfs: use nodesize everywhere, kill leafsize

The nodesize and leafsize were never of different values. Unify the
usage and make nodesize the one. Cleanup the redundant checks and
helpers.

Shaves a few bytes from .text:

  text    data     bss     dec     hex filename
852418   24560   23112  900090   dbbfa btrfs.ko.before
851074   24584   23112  898770   db6d2 btrfs.ko.after

Signed-off-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <clm@fb.com>

1 files changed, 1 insertions, 16 deletions

diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c
index 053dd000d4ef..4ae1c5feccbe 100644
--- a/fs/btrfs/scrub.c
+++ b/fs/btrfs/scrub.c
@@ -137,7 +137,6 @@ struct scrub_ctx {
         int                     pages_per_rd_bio;
         u32                     sectorsize;
         u32                     nodesize;
-        u32                     leafsize;
 
         int                     is_dev_replace;
         struct scrub_wr_ctx     wr_ctx;
@@ -438,7 +437,6 @@ struct scrub_ctx *scrub_setup_ctx(struct btrfs_device *dev, int is_dev_replace)
         }
         sctx->first_free = 0;
         sctx->nodesize = dev->dev_root->nodesize;
-        sctx->leafsize = dev->dev_root->leafsize;
         sctx->sectorsize = dev->dev_root->sectorsize;
         atomic_set(&sctx->bios_in_flight, 0);
         atomic_set(&sctx->workers_pending, 0);
@@ -1758,7 +1756,6 @@ static int scrub_checksum_tree_block(struct scrub_block *sblock)
                    BTRFS_UUID_SIZE))
                 ++fail;
 
-        WARN_ON(sctx->nodesize != sctx->leafsize);
         len = sctx->nodesize - BTRFS_CSUM_SIZE;
         mapped_size = PAGE_SIZE - BTRFS_CSUM_SIZE;
         p = ((u8 *)mapped_buffer) + BTRFS_CSUM_SIZE;
@@ -2196,7 +2193,6 @@ static int scrub_extent(struct scrub_ctx *sctx, u64 logical, u64 len,
                 sctx->stat.data_bytes_scrubbed += len;
                 spin_unlock(&sctx->stat_lock);
         } else if (flags & BTRFS_EXTENT_FLAG_TREE_BLOCK) {
-                WARN_ON(sctx->nodesize != sctx->leafsize);
                 blocksize = sctx->nodesize;
                 spin_lock(&sctx->stat_lock);
                 sctx->stat.tree_extents_scrubbed++;
@@ -2487,7 +2483,7 @@ static noinline_for_stack int scrub_stripe(struct scrub_ctx *sctx,
                         btrfs_item_key_to_cpu(l, &key, slot);
 
                         if (key.type == BTRFS_METADATA_ITEM_KEY)
-                                bytes = root->leafsize;
+                                bytes = root->nodesize;
                         else
                                 bytes = key.offset;
 
@@ -2910,17 +2906,6 @@ int btrfs_scrub_dev(struct btrfs_fs_info *fs_info, u64 devid, u64 start,
         if (btrfs_fs_closing(fs_info))
                 return -EINVAL;
 
-        /*
-         * check some assumptions
-         */
-        if (fs_info->chunk_root->nodesize != fs_info->chunk_root->leafsize) {
-                btrfs_err(fs_info,
-                           "scrub: size assumption nodesize == leafsize (%d == %d) fails",
-                       fs_info->chunk_root->nodesize,
-                       fs_info->chunk_root->leafsize);
-                return -EINVAL;
-        }
-
         if (fs_info->chunk_root->nodesize > BTRFS_STRIPE_LEN) {
                 /*
                  * in this case scrub is unable to calculate the checksum