From patchwork Thu Jan 31 12:46:25 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Sterba X-Patchwork-Id: 2073461 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 9CD213FD1A for ; Thu, 31 Jan 2013 12:46:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752345Ab3AaMq2 (ORCPT ); Thu, 31 Jan 2013 07:46:28 -0500 Received: from cantor2.suse.de ([195.135.220.15]:36473 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751763Ab3AaMq1 (ORCPT ); Thu, 31 Jan 2013 07:46:27 -0500 Received: from relay2.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id 8D2F6A3CEE for ; Thu, 31 Jan 2013 13:46:26 +0100 (CET) Received: by ds.suse.cz (Postfix, from userid 10065) id 2C2B4DA847; Thu, 31 Jan 2013 13:46:26 +0100 (CET) Date: Thu, 31 Jan 2013 13:46:25 +0100 From: David Sterba To: David Sterba Cc: linux-btrfs@vger.kernel.org Subject: Re: Integration branch of btrfs-progs 2013-01-30 Message-ID: <20130131124625.GJ30535@twin.jikos.cz> Reply-To: dsterba@suse.cz References: <20130130002427.GD30535@twin.jikos.cz> <20130130002658.GE30535@twin.jikos.cz> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20130130002658.GE30535@twin.jikos.cz> User-Agent: Mutt/1.5.21 (2011-07-01) Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org On Wed, Jan 30, 2013 at 01:26:58AM +0100, David Sterba wrote: > Stefan Behrens (3): > Btrfs-progs: add command to get/reset device stats via ioctl JFI, pointed out on IRC: This hunk was mismerged, a missing break before case BTRFS_DEV_STATS_KEY: I'll fix it in next integration, as it's not so urgent. david --- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- a/print-tree.c +++ b/print-tree.c @@ -454,6 +454,8 @@ static void print_key_type(u64 objectid, u8 type) break; case BTRFS_QGROUP_LIMIT_KEY: printf("BTRFS_QGROUP_LIMIT_KEY"); + case BTRFS_DEV_STATS_KEY: + printf("DEV_STATS_ITEM"); break; default: printf("UNKNOWN.%d", type);