From patchwork Thu Nov 26 08:15:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qu Wenruo X-Patchwork-Id: 7705231 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id EC54EBF90C for ; Thu, 26 Nov 2015 08:18:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0E0A720790 for ; Thu, 26 Nov 2015 08:18:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EB91220785 for ; Thu, 26 Nov 2015 08:18:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752713AbbKZISK (ORCPT ); Thu, 26 Nov 2015 03:18:10 -0500 Received: from cn.fujitsu.com ([59.151.112.132]:11502 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1752222AbbKZISJ (ORCPT ); Thu, 26 Nov 2015 03:18:09 -0500 X-IronPort-AV: E=Sophos;i="5.20,242,1444665600"; d="scan'208";a="871032" Received: from unknown (HELO cn.fujitsu.com) ([10.167.250.3]) by heian.cn.fujitsu.com with ESMTP; 26 Nov 2015 16:17:56 +0800 Received: from localhost.localdomain (unknown [10.167.226.34]) by cn.fujitsu.com (Postfix) with ESMTP id 376894043CE5 for ; Thu, 26 Nov 2015 16:17:59 +0800 (CST) From: Qu Wenruo To: linux-btrfs@vger.kernel.org Subject: [PATCH] btrfs-progs: mkfs: Fix a wrong extent buffer size causing wrong superblock csum Date: Thu, 26 Nov 2015 16:15:55 +0800 Message-Id: <1448525755-1192-1-git-send-email-quwenruo@cn.fujitsu.com> X-Mailer: git-send-email 2.6.2 MIME-Version: 1.0 X-yoursite-MailScanner-Information: Please contact the ISP for more information X-yoursite-MailScanner-ID: 376894043CE5.ACCED X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: quwenruo@cn.fujitsu.com X-Spam-Status: No, score=-7.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP For make_btrfs(), it's setting wrong buf size for last super block write out. The superblock size is always BTRFS_SUPER_INFO_SIZE, not cfg->sectorsize. And this makes mkfs.btrfs -f -s 8K fails. Fix it to BTRFS_SUPER_INFO_SIZE. Signed-off-by: Qu Wenruo --- Thanks goodness, this time it's not my super block checksum patches causing bugs. --- utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils.c b/utils.c index 60235d8..00355a2 100644 --- a/utils.c +++ b/utils.c @@ -554,7 +554,7 @@ int make_btrfs(int fd, struct btrfs_mkfs_config *cfg) BUG_ON(sizeof(super) > cfg->sectorsize); memset(buf->data, 0, cfg->sectorsize); memcpy(buf->data, &super, sizeof(super)); - buf->len = cfg->sectorsize; + buf->len = BTRFS_SUPER_INFO_SIZE; csum_tree_block_size(buf, BTRFS_CRC32_SIZE, 0); ret = pwrite(fd, buf->data, cfg->sectorsize, cfg->blocks[0]); if (ret != cfg->sectorsize) {