From patchwork Sun Dec 5 17:47:36 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Goffredo Baroncelli X-Patchwork-Id: 381111 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 oB5HggxL022957 for ; Sun, 5 Dec 2010 17:42:43 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756436Ab0LERmj (ORCPT ); Sun, 5 Dec 2010 12:42:39 -0500 Received: from smtp207.alice.it ([82.57.200.103]:34132 "EHLO smtp207.alice.it" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756424Ab0LERmj (ORCPT ); Sun, 5 Dec 2010 12:42:39 -0500 Received: from venice.localnet (87.1.6.143) by smtp207.alice.it (8.5.124.08) id 4C9E16C9059395A2; Sun, 5 Dec 2010 18:42:34 +0100 To: Chris Mason Subject: [PATCH 3/5][REPOST][BTRFS-PROGS] Deprecate btrfsctl, btrfs-show, btrfs-vol Cc: linux-btrfs@vger.kernel.org, David Nicol From: Goffredo Baroncelli Reply-To: kreijack@libero.it Date: Sun, 5 Dec 2010 18:47:36 +0100 MIME-Version: 1.0 Message-Id: <201012051847.36807.kreijack@libero.it> 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 (demeter1.kernel.org [140.211.167.41]); Sun, 05 Dec 2010 17:43:11 +0000 (UTC) diff --git a/INSTALL b/INSTALL index 16b45a5..cbde78f 100644 --- a/INSTALL +++ b/INSTALL @@ -24,10 +24,15 @@ e2fsprogs-devel from various distros. Building the utilities is just make ; make install. The programs go into /usr/local/bin. The commands available are: +btrfs: control program to manage the filesystem. + mkfs.btrfs: create a filesystem btrfsctl: control program to create snapshots and subvolumes: + NOTE: this utility is deprecated. Please consider to switch + to the btrfs utility (see above) + mount /dev/sda2 /mnt btrfsctl -s new_subvol_name /mnt btrfsctl -s snapshot_of_default /mnt/default diff --git a/btrfs-show.c b/btrfs-show.c index c49626c..8210fd2 100644 --- a/btrfs-show.c +++ b/btrfs-show.c @@ -117,6 +117,11 @@ int main(int ac, char **av) int ret; int option_index = 0; + printf( "**\n" + "** WARNING: this program is considered deprecated\n" + "** Please consider to switch to the btrfs utility\n" + "**\n"); + while(1) { int c; c = getopt_long(ac, av, "", long_options, diff --git a/btrfs-vol.c b/btrfs-vol.c index 4ed799d..fe6f240 100644 --- a/btrfs-vol.c +++ b/btrfs-vol.c @@ -78,6 +78,11 @@ int main(int ac, char **av) struct btrfs_ioctl_vol_args args; u64 dev_block_count = 0; + printf( "**\n" + "** WARNING: this program is considered deprecated\n" + "** Please consider to switch to the btrfs utility\n" + "**\n"); + while(1) { int c; c = getopt_long(ac, av, "a:br:", long_options, diff --git a/btrfsctl.c b/btrfsctl.c index 92bdf39..d20c96a 100644 --- a/btrfsctl.c +++ b/btrfsctl.c @@ -107,6 +107,11 @@ int main(int ac, char **av) char *fullpath; u64 objectid = 0; + printf( "**\n" + "** WARNING: this program is considered deprecated\n" + "** Please consider to switch to the btrfs utility\n" + "**\n"); + if (ac == 2 && strcmp(av[1], "-a") == 0) { fprintf(stderr, "Scanning for Btrfs filesystems\n"); btrfs_scan_one_dir("/dev", 1); diff --git a/man/btrfs-show.8.in b/man/btrfs-show.8.in index dd0b147..cb98b68 100644 --- a/man/btrfs-show.8.in +++ b/man/btrfs-show.8.in @@ -3,6 +3,9 @@ btrfs-show \- scan the /dev directory for btrfs partitions and print results. .SH SYNOPSIS .B btrfs-show +.SH NOTE +.B btrfs-show +is deprecated. Please consider to switch to the btrfs utility. .SH DESCRIPTION .B btrfs-show is used to scan the /dev directory for btrfs partitions and display brief diff --git a/man/btrfsctl.8.in b/man/btrfsctl.8.in index c2d4488..8705fa6 100644 --- a/man/btrfsctl.8.in +++ b/man/btrfsctl.8.in @@ -10,6 +10,9 @@ btrfsctl \- control a btrfs filesystem [ \fB \-A\fP\fI device\fP ] [ \fB \-a\fP ] [ \fB \-c\fP ] +.SH NOTE +B btrfsctl +is deprecated. Please consider to switch to the btrfs utility. .SH DESCRIPTION .B btrfsctl is used to control the filesystem and the files and directories stored. It is