[PATCH] reiserfs: make resize option auto-get new device size

It's trivial for the resize option to auto-get the underlying device size,
while it's harder for the user.  I've copied the code from jfs.

Since of the different reiserfs option parser (which does not use the
superior match_token used by almost every other filesystem), I've had to
use the "resize=auto" and not "resize" option to specify this behaviour.
Changing the option parser to the kernel one wouldn't be bad but I've no
time to do this cleanup in this moment.

Btw, the mount(8) man page should be updated to include this option.  Cc
the relevant people, please (I hope I cc'ed the right people).

Cc: <reiserfs-dev@namesys.com>
Cc: <reiserfs-list@namesys.com>
Cc: <mtk-manpages@gmx.net>
Cc: Alex Zarochentsev <zam@namesys.com>
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
index bcdf2438d152216c890da5c4adcc0503a2802e8d..bc5e8893b5d5010190e3db5690f318697ab3733c 100644 (file)
--- a/fs/reiserfs/super.c
+++ b/fs/reiserfs/super.c
@@ -889,12 +889,18 @@ static int reiserfs_parse_options (struct super_block * s, char * options, /* st
            char * p;
            
            p = NULL;
-           /* "resize=NNN" */
-           *blocks = simple_strtoul (arg, &p, 0);
-           if (*p != '\0') {
-               /* NNN does not look like a number */
-               reiserfs_warning (s, "reiserfs_parse_options: bad value %s", arg);
-               return 0;
+           /* "resize=NNN" or "resize=auto" */
+
+           if (!strcmp(arg, "auto")) {
+                   /* From JFS code, to auto-get the size.*/
+                   *blocks = s->s_bdev->bd_inode->i_size >> s->s_blocksize_bits;
+           } else {
+                   *blocks = simple_strtoul (arg, &p, 0);
+                   if (*p != '\0') {
+                       /* NNN does not look like a number */
+                       reiserfs_warning (s, "reiserfs_parse_options: bad value %s", arg);
+                       return 0;
+                   }
            }
        }
 
@@ -903,7 +909,8 @@ static int reiserfs_parse_options (struct super_block * s, char * options, /* st
                unsigned long val = simple_strtoul (arg, &p, 0);
                /* commit=NNN (time in seconds) */
                if ( *p != '\0' || val >= (unsigned int)-1) {
-                       reiserfs_warning (s, "reiserfs_parse_options: bad value %s", arg);                      return 0;
+                       reiserfs_warning (s, "reiserfs_parse_options: bad value %s", arg);
+                       return 0;
                }
                *commit_max_age = (unsigned int)val;
        }