Bump version

diff --git a/VERSION b/VERSION
index df60b3ff7479385e79bd7ecba22e5aacf8f73f44..936d4040cc8b4c0fa835968658c420800f92e893 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -3,5 +3,5 @@
 #
 PKG_MAJOR=1
 PKG_MINOR=3
-PKG_REVISION=18
+PKG_REVISION=19
 PKG_BUILD=0

diff --git a/doc/CHANGES b/doc/CHANGES
index df8911babbab8cc5b0f84f40407548ff0b335607..1b98252a502e487284e7af29a5691989212e2b53 100644 (file)
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,3 +1,11 @@
+xfsprogs-1.3.19 (15 February 2002)
+       - fix xfs_repair option parsing for external logs
+       - add xfs_repair option parsing for realtime device
+       - fix xfs_repair version (-V) option - should not
+         require an argument
+       - add -V option to usage string
+       - document verbose (-v) and -r options in manpage
+
 xfsprogs-1.3.18 (17 January 2002)
        - fix mkfs.xfs buglet in overwriting signatures when run
          on a regular file

diff --git a/man/man8/xfs_repair.8 b/man/man8/xfs_repair.8
index c671c761c68b1aaa86f0eda6b4051e961729810d..025ea71a0ca336bece07cace884bc450ca90a67e 100644 (file)
--- a/man/man8/xfs_repair.8
+++ b/man/man8/xfs_repair.8
@@ -3,9 +3,11 @@
 xfs_repair \- repair an XFS filesystem
 .SH SYNOPSIS
 .nf
-\f3xfs_repair\f1 [ \f3\-nL\f1 ] [ \f3\-o\f1 subopt[=value] ] xfs_special
+\f3xfs_repair\f1 [ \f3\-nLvV\f1 ] [ \f3\-o\f1 subopt[=value] ]
+       [\f3-l\f1 logdev] [\f3-r\f1 rtdev] xfs_special
 .sp .8v
-\f3xfs_repair\f1 \f3\-f\f1 [ \f3\-nL\f1 ] [ \f3\-o\f1 subopt[=value] ] ... file
+\f3xfs_repair\f1 \f3\-f\f1 [ \f3\-nLvV\f1 ] [ \f3\-o\f1 subopt[=value] ]
+       [\f3-l\f1 logfile] [\f3-r\f1 rtfile] file
 .fi
 .SH DESCRIPTION
 .I xfs_repair
@@ -34,6 +36,8 @@ Specifies that the special device is actually a file (see the
 \f2mkfs.xfs\f1 \f3\-d\f1 \f2file\f1 option).
 This might happen if an image copy
 of a filesystem has been copied or written into an ordinary file.
+This option implies that any external log or realtime section
+is also in an ordinary file.
 .TP
 .B \-L
 Force Log Zeroing.
@@ -44,7 +48,7 @@ When using this option the filesystem will likely appear to be corrupt,
 and can cause the loss of user files and/or data.
 .TP
 .B \-l
-Specifies the device special file where the filesystems external
+Specifies the device special file where the filesystem's external
 log resides.
 Only for those filesystems which use an external log.
 See the
@@ -52,6 +56,15 @@ See the
 .IR xfs (5)
 for a detailed description of the XFS log.
 .TP
+.B \-r
+Specifies the device special file where the filesystem's realtime
+section resides.
+Only for those filesystems which use a realtime section.
+See the
+\f2mkfs.xfs\f1 \f3\-r\f1 option, and refer to
+.IR xfs (5)
+for a detailed description of the XFS realtime section.
+.TP
 .B \-n
 No modify mode.
 Specifies that
@@ -78,6 +91,9 @@ option is in effect,
 .I xfs_repair
 will assume that the filesystem is an XFS filesystem and
 will ignore an EFS superblock if one is found.
+.TP
+.B \-v
+Verbose output.
 .SS Checks Performed
 Inconsistencies corrected include the following:
 .TP

diff --git a/repair/globals.h b/repair/globals.h
index 71548d3c59475b51b4e40ca32a04df0df0be1f3e..e1dcbb9deb2c3ebb691bf096a104b94d3dfd62a4 100644 (file)
--- a/repair/globals.h
+++ b/repair/globals.h
@@ -127,8 +127,10 @@ EXTERN int delete_attr_ok;         /* can clear attrs w/o clearing files */
 EXTERN int     force_geo;              /* can set geo on low confidence info */
 EXTERN int     assume_xfs;             /* assume we have an xfs fs */
 EXTERN int     pre_65_beta;            /* fs was mkfs'ed by a version earlier * than 6.5-beta */
-EXTERN char *log_name;                 /* Name of log device */
-EXTERN int log_spec;                   /* Log dev specified as option */
+EXTERN char    *log_name;              /* Name of log device */
+EXTERN int     log_spec;               /* Log dev specified as option */
+EXTERN char    *rt_name;               /* Name of realtime device */
+EXTERN int     rt_spec;                /* Realtime dev specified as option */
 
 /* misc status variables */
 

diff --git a/repair/init.c b/repair/init.c
index 491c12127a28299c5881a9e15d67c2cbdf348b3f..e51658d53d12366705c72c60c6a02b29cc22a330 100644 (file)
--- a/repair/init.c
+++ b/repair/init.c
@@ -58,6 +58,12 @@ xfs_init(libxfs_init_t *args)
                /* REVISIT: Need to do fs sanity / log validity checking */
        }
 
+       if (rt_spec)  { /* RT device specified */
+               args->rtname = rt_name;
+               args->risfile = (isa_file?1:0);
+               /* XXX assume data file also means rt file */
+       }
+
        args->notvolmsg = "you should never get this message - %s";
        args->notvolok = 1;
        args->setblksize = 1;

diff --git a/repair/xfs_repair.c b/repair/xfs_repair.c
index a93da1be71362691cbe9d6b8863cefe466814508..1b76e075a3345614b3e98e2229edb551ad2369c3 100644 (file)
--- a/repair/xfs_repair.c
+++ b/repair/xfs_repair.c
@@ -72,7 +72,7 @@ char *o_opts[] = {
 static void
 usage(void)
 {
-       do_warn("Usage: %s [-nV] [-o subopt[=value]] [-l logdevice] devname\n",
+       do_warn("Usage: %s [-nLvV] [-o subopt[=value]] [-l logdev] [-r rtdev] devname\n",
                progname);
        exit(1);
 }
@@ -170,7 +170,7 @@ process_args(int argc, char **argv)
         * XXX have to add suboption processing here
         * attributes, quotas, nlinks, aligned_inos, sb_fbits
         */
-       while ((c = getopt(argc, argv, "o:flLnDvV:")) != EOF)  {
+       while ((c = getopt(argc, argv, "o:fl:r:LnDvV")) != EOF)  {
                switch (c) {
                case 'D':
                        dumpcore = 1;
@@ -206,6 +206,10 @@ process_args(int argc, char **argv)
                        log_name = optarg;
                        log_spec = 1;
                        break;
+               case 'r':
+                       rt_name = optarg;
+                       rt_spec = 1;
+                       break;
                case 'f':
                        isa_file = 1;
                        break;