From patchwork Wed Dec 15 22:18:50 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Patchwork-Submitter: David Nicol <davidnicol@gmail.com>
X-Patchwork-Id: 414741
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 oBFMJcf8030983
	for <patchwork-linux-btrfs@patchwork.kernel.org>;
	Wed, 15 Dec 2010 22:19:41 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753138Ab0LOWTN (ORCPT
	<rfc822;patchwork-linux-btrfs@patchwork.kernel.org>);
	Wed, 15 Dec 2010 17:19:13 -0500
Received: from mail-iw0-f180.google.com ([209.85.214.180]:61010 "EHLO
	mail-iw0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1753039Ab0LOWTL convert rfc822-to-8bit (ORCPT
	<rfc822;linux-btrfs@vger.kernel.org>);
	Wed, 15 Dec 2010 17:19:11 -0500
Received: by iwn37 with SMTP id 37so2816142iwn.11
	for <linux-btrfs@vger.kernel.org>;
	Wed, 15 Dec 2010 14:19:10 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
	h=domainkey-signature:received:mime-version:received:from:date
	:message-id:subject:to:content-type:content-transfer-encoding;
	bh=uDJz7VgNoCgLHrUdvZ8t/DFyKy8j+gbSAjAO4MVvNhY=;
	b=owXn1CObmUvlkoRrwhuc+kHeFOmU46YB8w5XoCq8bEP5MexJzHtJKw/nHpVOLyKoOd
	DCOJscgn4d8PcctOwm5TGwTnyGtUR7X9ESQmPVgxfOkenx+Ij04wAltbpvCIeE9vSV6l
	qNI65BOzYoie2Ic6RhQLcBZ7tBNe6juuAaZ1E=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;
	h=mime-version:from:date:message-id:subject:to:content-type
	:content-transfer-encoding;
	b=TciipVJihEj3bRlSUnqgVodmnWf4blo8+hmZFQjklzxKc7MEjIkY7zrsVIvPYM4x6O
	ivok8ZtDIwC8hxnQmymotykkShtVS71KAkIfCR4xuq74eMJj8mZ0Mxkd/1thcRqrCuiW
	qCJ3gXKvcmYG3Mn2lEHBRbHRtTveQedFjzkR0=
Received: by 10.231.14.134 with SMTP id g6mr5442913iba.65.1292451550745; Wed,
	15 Dec 2010 14:19:10 -0800 (PST)
MIME-Version: 1.0
Received: by 10.231.206.148 with HTTP; Wed, 15 Dec 2010 14:18:50 -0800 (PST)
From: David Nicol <davidnicol@gmail.com>
Date: Wed, 15 Dec 2010 16:18:50 -0600
Message-ID: <AANLkTikHZZuk+Z4+CUsiHyeL2zba6EYV4Wo2EqQnDCwm@mail.gmail.com>
Subject: revised ioctl#21 btrfsprogs patch
To: BTRFS MAILING LIST <linux-btrfs@vger.kernel.org>
Sender: linux-btrfs-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-btrfs.vger.kernel.org>
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]);
	Wed, 15 Dec 2010 22:19:41 +0000 (UTC)


diff --git a/Makefile b/Makefile
index d65f6a2..b8ef1f2 100644
--- a/Makefile
+++ b/Makefile
@@ -37,12 +37,13 @@ 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 iso8601toms.o
+       gcc $(CFLAGS) -o btrfs btrfs.o btrfs_cmds.o iso8601toms.o \
               $(objects) $(LDFLAGS) $(LIBS)

-btrfsctl: $(objects) btrfsctl.o
-       gcc $(CFLAGS) -o btrfsctl btrfsctl.o $(objects) $(LDFLAGS) $(LIBS)
+btrfsctl: $(objects) btrfsctl.o iso8601toms.o
+       gcc $(CFLAGS) -o btrfsctl btrfsctl.o iso8601toms.o \
+               $(objects) $(LDFLAGS) $(LIBS)

 btrfs-vol: $(objects) btrfs-vol.o
       gcc $(CFLAGS) -o btrfs-vol btrfs-vol.o $(objects) $(LDFLAGS) $(LIBS)
diff --git a/btrfs.c b/btrfs.c
index 46314cf..6b3ebf6 100644
--- a/btrfs.c
+++ b/btrfs.c
@@ -29,6 +29,7 @@ struct Command {
       CommandFunction func;   /* function which implements the command */
       int     nargs;          /* if == 999, any number of arguments
                                  if >= 0, number of arguments,
+                                  if > 1000, 1000 more than the
_maximum_ number of arguments,
                                  if < 0, _minimum_ number of arguments */
       char    *verb;          /* verb */
       char    *help;          /* help lines; form the 2nd onward they are
@@ -73,14 +74,19 @@ static struct Command commands[] = {
               "Set the subvolume of the filesystem <path> which will
be mounted\n"
               "as default."
       },
-       { do_fssync, 1,
-         "filesystem sync", "<path>\n"
-               "Force a sync on the filesystem <path>."
+       { do_fssync, 1002,
+         "filesystem sync", "[-dq] <path>\n"
+               "Force a sync on the filesystem <path>, defaulting to '.'."
+       },
+       { do_wait4clean, 1002, /* require at most two args */
+         "filesystem reclaim", "[path [timeout]] \n"
+               "Wait for cleanup of deleted subvolumes. Path defaults to .\n"
+               "Timeout in seconds, or add m for minutes.\n"
       },
       { do_resize, 2,
         "filesystem resize", "[+/-]<newsize>[gkm]|max <filesystem>\n"
               "Resize the file system. If 'max' is passed, the filesystem\n"
-               "will occupe all available space on the device."
+               "will occupy all available space on the device."
       },
       { do_show_filesystem, 999,
         "filesystem show", "[<uuid>|<label>]\n"
@@ -349,6 +355,15 @@ static int parse_args(int argc, char **argv,
               return -2;

       /* check the number of argument */
+
+       if(matchcmd->nargs > 1000 ){
+          if ( matchcmd->nargs < (1000 + *nargs_)){
+               fprintf(stderr, "ERROR: '%s' requires only %d or fewer
arg(s)\n",
+                       matchcmd->verb, matchcmd->nargs - 1000 );
+                       return -2;
+          }
+       } else {
+
       if (matchcmd->nargs < 0 && matchcmd->nargs < -*nargs_ ){
               fprintf(stderr, "ERROR: '%s' requires minimum %d arg(s)\n",
                       matchcmd->verb, -matchcmd->nargs);
@@ -359,7 +374,7 @@ static int parse_args(int argc, char **argv,
                       matchcmd->verb, matchcmd->nargs);
                       return -2;
       }
-
+       }
        if (prepare_args( nargs_, args_, prgname, matchcmd )){
                fprintf(stderr, "ERROR: not enough memory\\n");
               return -20;
diff --git a/btrfs_cmds.c b/btrfs_cmds.c
index 8031c58..89f1f22 100644
--- a/btrfs_cmds.c
+++ b/btrfs_cmds.c
@@ -507,15 +507,37 @@ int do_create_subvol(int argc, char **argv)
 int do_fssync(int argc, char **argv)
 {
       int fd, res;
-       char    *path = argv[1];
-
+        int cleanup=1, quiet=0;
+       char    *path = ".", *p; /* [-dq] [<path>] */
+        struct btrfs_ioctl_cleaner_wait_args w4c_arg;
+
+        if (argc > 1){
+           if (argv[1][0] == '-'){
+             for (p=&argv[1][1]; *p; p++) switch (*p){
+                case 'q': quiet++; break;
+                case 'd': cleanup++; break;
+                default:
+                   fprintf(stderr,
+     "ERROR: unknown flag '%c' in '%s'\n", *p,argv[1]);
+                  return 12;
+             };
+             if (argc > 2)
+                 path = argv[2];
+
+           }else{
+              path = argv[1];
+
+           };
+
+        };
+    while (cleanup--){ /* cleanup starts at 1 */
       fd = open_file_or_dir(path);
       if (fd < 0) {
               fprintf(stderr, "ERROR: can't access to '%s'\n", path);
               return 12;
       }

-       printf("FSSync '%s'\n", path);
+       if (!quiet) printf("FSSync '%s'\n", path);
       res = ioctl(fd, BTRFS_IOC_SYNC);
       close(fd);
       if( res < 0 ){
@@ -523,6 +545,56 @@ int do_fssync(int argc, char **argv)
               return 16;
       }

+        if (cleanup){
+           w4c_arg.ms = 0x00000000;
+           w4c_arg.flags = 0x00000000;
+          fd = open_file_or_dir(path);
+          if (fd < 0) {
+               fprintf(stderr, "ERROR: can't access to '%s'\n", path);
+               return 12;
+          }
+          if (!quiet) printf("reclaim: '%s'\n", path);
+          res = ioctl(fd, BTRFS_IOC_CLEANER_WAIT, &w4c_arg);
+          close(fd);
+          if( res != 0 ){
+               fprintf(stderr, "%s:error #%i:%s\n",
+                        path, errno,strerror(errno));
+               return errno;
+          }
+        }
+    };
+       return 0;
+}
+
+#include "iso8601toms.h"
+
+int do_wait4clean(int argc, char **argv)
+{
+       int fd, res;
+        struct btrfs_ioctl_cleaner_wait_args w4c_arg;
+
+       char    *path = ".";
+        w4c_arg.ms = 0x00000000;
+        w4c_arg.flags = 0x00000000;
+
+        if (argc > 1)
+            path = argv[1];
+        if (argc > 2)
+             w4c_arg.ms = iso8601toms(argv[2]);
+
+       fd = open_file_or_dir(path);
+       if (fd < 0) {
+               fprintf(stderr, "ERROR: can't open file or dir '%s'\n", path);
+               return 12;
+       }
+       res = ioctl(fd, BTRFS_IOC_CLEANER_WAIT, &w4c_arg);
+       close(fd);
+       if( res != 0 ){
+               fprintf(stderr, "%s:error #%i:%s\n",
+                        path, errno,strerror(errno));
+               return errno;
+       }
+
       return 0;
 }

diff --git a/btrfs_cmds.h b/btrfs_cmds.h
index 7bde191..c958338 100644
--- a/btrfs_cmds.h
+++ b/btrfs_cmds.h
@@ -19,6 +19,7 @@ int do_clone(int nargs, char **argv);
 int do_delete_subvolume(int nargs, char **argv);
 int do_create_subvol(int nargs, char **argv);
 int do_fssync(int nargs, char **argv);
+int do_wait4clean(int nargs, char **argv);
 int do_defrag(int argc, char **argv);
 int do_show_filesystem(int nargs, char **argv);
 int do_add_volume(int nargs, char **args);
diff --git a/btrfsctl.c b/btrfsctl.c
index 92bdf39..cf7f69a 100644
--- a/btrfsctl.c
+++ b/btrfsctl.c
@@ -34,6 +34,7 @@
 #include "ctree.h"
 #include "transaction.h"
 #include "utils.h"
+#include "iso8601toms.h"
 #include "version.h"

 #ifdef __CHECKER__
@@ -57,6 +58,7 @@ static void print_usage(void)
       printf("\t-a: scans all devices for Btrfs filesystems\n");
       printf("\t-c: forces a single FS sync\n");
       printf("\t-D: delete snapshot\n");
+       printf("\t-C [timeout [directory]]: wait for snapshot space
recovery\n");
       printf("\t-m [tree id] directory: set the default mounted subvolume"
              " to the [tree id] or the directory\n");
       printf("%s\n", BTRFS_BUILD_VERSION);
@@ -96,7 +98,7 @@ int main(int ac, char **av)
       char *fname = NULL;
       char *snap_location = NULL;
       int snap_fd = 0;
-       int fd;
+       int fd = -999; /* silence a warning */
       int ret;
       struct btrfs_ioctl_vol_args args;
       char *name = NULL;
@@ -106,6 +108,7 @@ int main(int ac, char **av)
       char *pos;
       char *fullpath;
       u64 objectid = 0;
+        struct btrfs_ioctl_cleaner_wait_args CWargs;

       if (ac == 2 && strcmp(av[1], "-a") == 0) {
               fprintf(stderr, "Scanning for Btrfs filesystems\n");
@@ -186,6 +189,11 @@ int main(int ac, char **av)
                               fprintf(stderr, "-D size too long\n");
                               exit(1);
                       }
+               } else if (strcmp(av[i], "-C") == 0) {
+                       command = BTRFS_IOC_CLEANER_WAIT;
+                        CWargs.ms = ( ac > (i+1) ?
iso8601toms(av[i+1]) : 0x00000000 );
+                        CWargs.flags = 0x00000000;
+                       name = ( ac > ( i+2 ) ? av[i + 2] : "." );
               } else if (strcmp(av[i], "-A") == 0) {
                       if (i >= ac - 1) {
                               fprintf(stderr, "-A requires an arg\n");
@@ -232,7 +240,7 @@ int main(int ac, char **av)
                       exit(1);
               }
               name = fname;
-        } else {
+       } else if (command != BTRFS_IOC_CLEANER_WAIT) {
               fd = open_file_or_dir(fname);
        }

@@ -247,6 +255,9 @@ int main(int ac, char **av)
       } else if (command == BTRFS_IOC_DEFAULT_SUBVOL) {
               printf("objectid is %llu\n", objectid);
               ret = ioctl(fd, command, &objectid);
+       } else if (command == BTRFS_IOC_CLEANER_WAIT) {
+               fd = open_file_or_dir(name);
+               ret = ioctl(fd, command, &CWargs);
       } else
               ret = ioctl(fd, command, &args);
       if (ret < 0) {
diff --git a/ioctl.h b/ioctl.h
index 776d7a9..dc3f2fb 100644
--- a/ioctl.h
+++ b/ioctl.h
@@ -169,4 +169,11 @@ struct btrfs_ioctl_space_args {
 #define BTRFS_IOC_DEFAULT_SUBVOL _IOW(BTRFS_IOCTL_MAGIC, 19, u64)
 #define BTRFS_IOC_SPACE_INFO _IOWR(BTRFS_IOCTL_MAGIC, 20, \
                                   struct btrfs_ioctl_space_args)
+struct btrfs_ioctl_cleaner_wait_args{
+        __u32 ms;
+        __u32 flags; /* controls what to wait for, and stricture.
Zero waits for subvol deletions. */
+};
+#define BTRFS_IOC_CLEANER_WAIT _IOW(BTRFS_IOCTL_MAGIC, 21, \
+                                   struct btrfs_ioctl_cleaner_wait_args)
 #endif
+
diff --git a/man/btrfs.8.in b/man/btrfs.8.in
index 26ef982..a62f02b 100644
--- a/man/btrfs.8.in
+++ b/man/btrfs.8.in
@@ -17,7 +17,9 @@ btrfs \- control a btrfs filesystem
 .PP
 \fBbtrfs\fP \fBfilesystem defrag\fP\fI <file>|<dir> [<file>|<dir>...]\fP
 .PP
-\fBbtrfs\fP \fBfilesystem sync\fP\fI <path> \fP
+\fBbtrfs\fP \fBfilesystem sync\fP\fI [-dq] [<path>] \fP
+.PP
+\fBbtrfs\fP \fBfilesystem reclaim\fP\fI [path [timeout]] \fP
 .PP
 \fBbtrfs\fP \fBfilesystem resize\fP\fI [+/\-]<size>[gkm]|max <filesystem>\fP
 .PP
@@ -111,8 +113,22 @@ Scan devices for a btrfs filesystem. If no
devices are passed, \fBbtrfs\fR scans
 all the block devices.
 .TP

-\fBfilesystem sync\fR\fI <path> \fR
-Force a sync for the filesystem identified by \fI<path>\fR.
+\fBfilesystem sync\fR \fI[-dq] [<path>]\fR
+Force a sync for the filesystem identified by \fI<path>\fR, which defaults
+to the current directory. Use the \fI-d\fR switch to wait for the deleted
+subvolume cleaner thread to finish, and the \fI-q\fR switch to suppress
+informational output.
+.TP
+
+\fBfilesystem reclaim\fR\fI [path [timeout]] \fR
+Wait for recovery of space from deleted
+subvolumes on the filesystem containing \fIpath\fR,
+which defaults to the current working directory, to complete.
+The optional timeout parameter is a series of number[.number][letter]
+components where the letter is one of wdhms for weeks, days, hours, minutes,
+seconds, defaulting to seconds. The default timeout is zero which means
+no timeout. 90, 1.5m, and PT1.5M all mean ninety seconds.
+
 .TP

 .\"
diff --git a/man/btrfsctl.8.in b/man/btrfsctl.8.in
index c2d4488..890c625 100644
--- a/man/btrfsctl.8.in
+++ b/man/btrfsctl.8.in
@@ -10,6 +10,7 @@ btrfsctl \- control a btrfs filesystem
 [ \fB \-A\fP\fI device\fP ]
 [ \fB \-a\fP ]
 [ \fB \-c\fP ]
+[ \fB \-C\fP\fI [timeout [directory]]\fP ]
 .SH DESCRIPTION
 .B btrfsctl
 is used to control the filesystem and the files and directories