From patchwork Thu Aug 8 10:51:39 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Behrens X-Patchwork-Id: 2841014 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 29E4ABF535 for ; Thu, 8 Aug 2013 10:51:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3C832204BB for ; Thu, 8 Aug 2013 10:51:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 89649204B2 for ; Thu, 8 Aug 2013 10:51:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965093Ab3HHKvm (ORCPT ); Thu, 8 Aug 2013 06:51:42 -0400 Received: from xp-ob.rzone.de ([81.169.146.137]:14719 "EHLO xp-ob.rzone.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965026Ab3HHKvl (ORCPT ); Thu, 8 Aug 2013 06:51:41 -0400 X-RZG-CLASS-ID: xp Received: from pizpot.store ([192.168.43.236]) by joses.store (RZmta 31.37 OK) with ESMTP id 600811p789DFhe for ; Thu, 8 Aug 2013 12:51:39 +0200 (CEST) From: Stefan Behrens To: linux-btrfs@vger.kernel.org Subject: [PATCH] Btrfs-progs: fix a regression in mkfs.btrfs Date: Thu, 8 Aug 2013 12:51:39 +0200 Message-Id: <1375959099-30488-1-git-send-email-sbehrens@giantdisaster.de> X-Mailer: git-send-email 1.8.3.4 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Commit 55061a98 adds a cut & paste error that makes mkfs.btrfs fail if leafsize != sectorsize. Signed-off-by: Stefan Behrens Reviewed-by: Filipe Manana --- utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils.c b/utils.c index 15b991f..691b075 100644 --- a/utils.c +++ b/utils.c @@ -430,7 +430,7 @@ int make_btrfs(int fd, const char *device, const char *label, ret = pwrite(fd, buf->data, sectorsize, blocks[0]); if (ret < 0) return -errno; - else if (ret != leafsize) + else if (ret != sectorsize) return -EIO; free(buf);