From patchwork Wed Mar 30 16:53:09 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Schmidt X-Patchwork-Id: 674811 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p2UGrZfU025007 for ; Wed, 30 Mar 2011 16:53:35 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932825Ab1C3QxY (ORCPT ); Wed, 30 Mar 2011 12:53:24 -0400 Received: from ysabell.rzone.de ([81.169.144.237]:26728 "EHLO ysabell.rzone.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756104Ab1C3QxP (ORCPT ); Wed, 30 Mar 2011 12:53:15 -0400 Received: from gargravarr.store (gargravarr.store [192.168.42.236]) by ysabell.rzone.de (Postfix) with ESMTP id 7CC51476; Wed, 30 Mar 2011 18:53:13 +0200 (MEST) Received: by gargravarr.store (Postfix, from userid 32566) id 6F15D44B92; Wed, 30 Mar 2011 18:53:13 +0200 (CEST) From: Jan Schmidt To: chris.mason@oracle.com, linux-btrfs@vger.kernel.org Subject: [PATCH v2 1/5] commands added Date: Wed, 30 Mar 2011 18:53:09 +0200 Message-Id: X-Mailer: git-send-email 1.7.3.4 In-Reply-To: References: In-Reply-To: References: 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.6 (demeter1.kernel.org [140.211.167.41]); Wed, 30 Mar 2011 16:53:35 +0000 (UTC) diff --git a/Makefile b/Makefile index 6e6f6c6..6630887 100644 --- a/Makefile +++ b/Makefile @@ -37,8 +37,8 @@ all: version $(progs) manpages version: bash version.sh -btrfs: $(objects) btrfs.o btrfs_cmds.o - gcc $(CFLAGS) -o btrfs btrfs.o btrfs_cmds.o \ +btrfs: $(objects) btrfs.o btrfs_cmds.o scrub.o + gcc -lpthread $(CFLAGS) -o btrfs btrfs.o btrfs_cmds.o scrub.o \ $(objects) $(LDFLAGS) $(LIBS) btrfsctl: $(objects) btrfsctl.o diff --git a/btrfs.c b/btrfs.c index 46314cf..2dfa0b7 100644 --- a/btrfs.c +++ b/btrfs.c @@ -89,12 +89,28 @@ static struct Command commands[] = { }, { do_df_filesystem, 1, "filesystem df", "\n" - "Show space usage information for a mount point\n." + "Show space usage information for a mount point." }, { do_balance, 1, "filesystem balance", "\n" "Balance the chunks across the device." }, + { do_scrub_start, -1, + "scrub start", "[-Bdqr] |\n" + "Start a new scrub." + }, + { do_scrub_cancel, 1, + "scrub cancel", "|\n" + "Cancel a running scrub." + }, + { do_scrub_resume, -1, + "scrub resume", "[-Bdqr] |\n" + "Resume previously canceled or interrupted scrub." + }, + { do_scrub_status, -1, + "scrub status", "[-d] |\n" + "Show status of running or finished scrub." + }, { do_scan, 999, "device scan", "[ [..]\n" "Scan all device for or the passed device for a btrfs\n" diff --git a/btrfs_cmds.c b/btrfs_cmds.c index 8031c58..39f84a8 100644 --- a/btrfs_cmds.c +++ b/btrfs_cmds.c @@ -90,7 +90,7 @@ static int test_isdir(char *path) } -static int open_file_or_dir(const char *fname) +int open_file_or_dir(const char *fname) { int ret; struct stat st; @@ -776,6 +776,7 @@ int do_balance(int argc, char **argv) } return 0; } + int do_remove_volume(int nargs, char **args) { diff --git a/btrfs_cmds.h b/btrfs_cmds.h index 7bde191..a879288 100644 --- a/btrfs_cmds.h +++ b/btrfs_cmds.h @@ -23,6 +23,10 @@ int do_defrag(int argc, char **argv); int do_show_filesystem(int nargs, char **argv); int do_add_volume(int nargs, char **args); int do_balance(int nargs, char **argv); +int do_scrub_start(int nargs, char **argv); +int do_scrub_status(int argc, char **argv); +int do_scrub_resume(int argc, char **argv); +int do_scrub_cancel(int nargs, char **argv); int do_remove_volume(int nargs, char **args); int do_scan(int nargs, char **argv); int do_resize(int nargs, char **argv); @@ -32,3 +36,4 @@ int list_subvols(int fd); int do_df_filesystem(int nargs, char **argv); int find_updated_files(int fd, u64 root_id, u64 oldest_gen); int do_find_newer(int argc, char **argv); +int open_file_or_dir(const char *fname);