From patchwork Wed Oct 10 01:52:27 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robin Dong X-Patchwork-Id: 1571991 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 27470DFFAD for ; Wed, 10 Oct 2012 01:52:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757339Ab2JJBwl (ORCPT ); Tue, 9 Oct 2012 21:52:41 -0400 Received: from mail-pa0-f46.google.com ([209.85.220.46]:43288 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755250Ab2JJBwk (ORCPT ); Tue, 9 Oct 2012 21:52:40 -0400 Received: by mail-pa0-f46.google.com with SMTP id hz1so13979pad.19 for ; Tue, 09 Oct 2012 18:52:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=OWFEPlyp2HBzJGtn0/i+3ygqwaTNCr2AQYiAyNBCjh4=; b=jSVZz8Z/sx22vLsahpiJa6sG9lBPKWmGS3cKEa2H80MahZYJp3zfLdI3eA7N3WrGOl mK3qKJ24x/8gQ9hTLqHj66dIr0GaFxitbwy8+I7NqkYF1stJntW38S2unI5En+yARzRP Dy4Ul98UpuPXflzV2VWGifx++rfsGsoK4oHnjEC1q3hN14iBZDae6S8Vh69H3BxWDDeM rZIdNO8OOvuGMu3mGDh07rAYwKsNxhAjD8GgmfsPZBw+0S9jv//dX8Vcwiu7/aX3ZBP8 hxYUkQrOidk5P9uzYa7ZCR/z9CRN5FoofmYQ1CBW4DAde47h54+GFUf/fmhF9+BH1tF8 K9RQ== Received: by 10.66.85.37 with SMTP id e5mr9084135paz.64.1349833959788; Tue, 09 Oct 2012 18:52:39 -0700 (PDT) Received: from localhost.localdomain ([110.75.120.247]) by mx.google.com with ESMTPS id uj3sm179910pbc.39.2012.10.09.18.52.37 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 09 Oct 2012 18:52:38 -0700 (PDT) From: Robin Dong To: linux-btrfs@vger.kernel.org Cc: Robin Dong Subject: [PATCH v3 1/2] btrfs-progs: limit the max value of leafsize and nodesize Date: Wed, 10 Oct 2012 09:52:27 +0800 Message-Id: <1349833948-11465-1-git-send-email-robin.k.dong@gmail.com> X-Mailer: git-send-email 1.7.3.2 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org From: Robin Dong Using mkfs.btrfs like: mkfs.btrfs -l 131072 /dev/sda will return no error, but after mount it, the dmesg will report: BTRFS: couldn't mount because metadata blocksize (131072) was too large The leafsize and nodesize are equal at present, so we just use one function "check_leaf_or_node_size" to limit leaf and node size below BTRFS_MAX_METADATA_BLOCKSIZE. Signed-off-by: Robin Dong --- v2 <- v1: - add function check_leaf_or_node_size to limit leafsize and nodesize. v3 <- v2: - add quota string "sectorsize". ctree.h | 6 ++++++ mkfs.c | 29 +++++++++++++++++++++++------ 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/ctree.h b/ctree.h index 7f55229..75c1e0a 100644 --- a/ctree.h +++ b/ctree.h @@ -111,6 +111,12 @@ struct btrfs_trans_handle; #define BTRFS_DEV_ITEMS_OBJECTID 1ULL /* + * the max metadata block size. This limit is somewhat artificial, + * but the memmove costs go through the roof for larger blocks. + */ +#define BTRFS_MAX_METADATA_BLOCKSIZE 65536 + +/* * we can actually store much bigger names, but lets not confuse the rest * of linux */ diff --git a/mkfs.c b/mkfs.c index dff5eb8..93672b9 100644 --- a/mkfs.c +++ b/mkfs.c @@ -1201,6 +1201,27 @@ static int zero_output_file(int out_fd, u64 size, u32 sectorsize) return ret; } +static int check_leaf_or_node_size(u32 size, u32 sectorsize) +{ + if (size < sectorsize) { + fprintf(stderr, + "Illegal leafsize (or nodesize) %u (smaller than sectorsize %u)\n", + size, sectorsize); + return -1; + } else if (size > BTRFS_MAX_METADATA_BLOCKSIZE) { + fprintf(stderr, + "Illegal leafsize (or nodesize) %u (larger than %u)\n", + size, BTRFS_MAX_METADATA_BLOCKSIZE); + return -1; + } else if (size & (sectorsize - 1)) { + fprintf(stderr, + "Illegal leafsize (or nodesize) %u (not aligned to %u)\n", + size, sectorsize); + return -1; + } + return 0; +} + int main(int ac, char **av) { char *file; @@ -1291,14 +1312,10 @@ int main(int ac, char **av) } } sectorsize = max(sectorsize, (u32)getpagesize()); - if (leafsize < sectorsize || (leafsize & (sectorsize - 1))) { - fprintf(stderr, "Illegal leafsize %u\n", leafsize); + if (check_leaf_or_node_size(leafsize, sectorsize)) exit(1); - } - if (nodesize < sectorsize || (nodesize & (sectorsize - 1))) { - fprintf(stderr, "Illegal nodesize %u\n", nodesize); + if (check_leaf_or_node_size(nodesize, sectorsize)) exit(1); - } ac = ac - optind; if (ac == 0) print_usage();