Grow: set new_data_offset if appropriate

diff --git a/mdadm.h b/mdadm.h
index 1f4f23bf94b240690efa65976f0ccab252684591..b808739aea6770687e2281a4ed03448db14c04db 100644 (file)
--- a/mdadm.h
+++ b/mdadm.h
@@ -188,6 +188,7 @@ struct mdinfo {
        int                     uuid[4];
        char                    name[33];
        unsigned long long      data_offset;
+       unsigned long long      new_data_offset;
        unsigned long long      component_size; /* same as array.size, except in
                                                 * sectors and up to 64bits.
                                                 */

diff --git a/sysfs.c b/sysfs.c
index 47294556eef5957047e2aac076408fd3d9f57091..a7ff38a4d85bc6da9602cf43f5538228e1c6daf9 100644 (file)
--- a/sysfs.c
+++ b/sysfs.c
@@ -302,6 +302,11 @@ struct mdinfo *sysfs_read(int fd, int devnum, unsigned long options)
                        if (load_sys(fname, buf))
                                goto abort;
                        dev->data_offset = strtoull(buf, NULL, 0);
+                       strcpy(dbase, "new_offset");
+                       if (load_sys(fname, buf) == 0)
+                               dev->new_data_offset = strtoull(buf, NULL, 0);
+                       else
+                               dev->new_data_offset = dev->data_offset;
                }
                if (options & GET_SIZE) {
                        strcpy(dbase, "size");