From patchwork Thu Feb 11 13:09:39 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sten Heinze X-Patchwork-Id: 78704 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o1BDAB0o025288 for ; Thu, 11 Feb 2010 13:10:11 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754747Ab0BKNJw (ORCPT ); Thu, 11 Feb 2010 08:09:52 -0500 Received: from mail.gmx.net ([213.165.64.20]:48462 "HELO mail.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1752963Ab0BKNJv (ORCPT ); Thu, 11 Feb 2010 08:09:51 -0500 Received: (qmail invoked by alias); 11 Feb 2010 13:09:49 -0000 Received: from c-68-53-84-65.hsd1.tn.comcast.net (EHLO stockholm.localnet) [68.53.84.65] by mail.gmx.net (mp018) with SMTP; 11 Feb 2010 14:09:49 +0100 X-Authenticated: #8567879 X-Provags-ID: V01U2FsdGVkX1/hDgtV4JfhekmxpG7tV3NcJK2J2bY8Ar50qpitdU 5mkUVG5cuxZP+l From: Sten Heinze To: linux-btrfs@vger.kernel.org Subject: Re: Patch: Allow options to be passed to btrfsck Date: Thu, 11 Feb 2010 14:09:39 +0100 User-Agent: KMail/1.12.4 (Linux/2.6.32-trunk-686; KDE/4.3.4; i686; ; ) Cc: 567681@bugs.debian.org References: <4B71B538.1040709@debian.org> <201002111359.43978.sten.heinze@gmx.de> In-Reply-To: <201002111359.43978.sten.heinze@gmx.de> MIME-Version: 1.0 Message-Id: <201002111409.39348.sten.heinze@gmx.de> X-Y-GMX-Trusted: 0 X-FuHaFi: 0.67000000000000004 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 11 Feb 2010 13:10:14 +0000 (UTC) Index: btrfs-tools/btrfsck.c =================================================================== --- btrfs-tools.orig/btrfsck.c 2010-02-08 05:44:01.037134357 +0100 +++ btrfs-tools/btrfsck.c 2010-02-11 05:02:15.469358404 +0100 @@ -2807,7 +2807,7 @@ static void print_usage(void) { - fprintf(stderr, "usage: btrfsck dev\n"); + fprintf(stderr, "usage: btrfsck [option] dev\n"); fprintf(stderr, "%s\n", BTRFS_BUILD_VERSION); exit(1); } @@ -2821,9 +2821,24 @@ if (ac < 2) print_usage(); + char *file = av[ac - 1]; + int pos; + for( pos = 1; pos < ac; ++pos) + { + /* ignore all options for now, stop at first device found */ + if (av[pos][0] != '-') + { + file = av[pos]; + break; + } + } + + /* print device fsck'ed */ + printf("%s: ", file); + radix_tree_init(); cache_tree_init(&root_cache); - root = open_ctree(av[1], 0, 0); + root = open_ctree(file, 0, 0); if (root == NULL) return 1;