New api xfs_growfs for expanding a XFS filesystem. Signed-off-by: Wanlong Gao <gaowanlong(a)cn.fujitsu.com&gt; --- daemon/xfs.c | 111 +++++++++++++++++++++++++++++++++++++++++ generator/generator_actions.ml | 28 +++++++++++ gobject/Makefile.inc | 6 ++- po/POTFILES | 1 + src/MAX_PROC_NR | 2 +- 5 files changed, 145 insertions(+), 3 deletions(-) diff --git a/daemon/xfs.c b/daemon/xfs.c index e0f0062..73ba791 100644 --- a/daemon/xfs.c +++ b/daemon/xfs.c @@ -28,6 +28,8 @@ #include "actions.h" #include "optgroups.h" +#define MAX_ARGS 64 + int optgroup_xfs_available (void) { @@ -348,3 +350,112 @@ error: free_strings (lines); return ret; } + +char * +do_xfs_growfs (const char *path, + int datasec, int logsec, int rtsec, + int64_t datasize, int64_t logsize, int64_t rtsize, + int64_t rtextsize, int32_t maxpct) +{ + int r; + char *buf; + char *out = NULL, *err = NULL; + const char *argv[MAX_ARGS]; + char datasize_s[64]; + char logsize_s[64]; + char rtsize_s[64]; + char rtextsize_s[64]; + char maxpct_s[32]; + size_t i = 0; + + buf = sysroot_path (path); + if (buf == NULL) { + reply_with_perror ("malloc"); + return NULL; + } + + ADD_ARG (argv, i, "xfs_growfs"); + + /* Optional arguments */ + if (!(optargs_bitmask & GUESTFS_XFS_GROWFS_DATASEC_BITMASK)) + datasec = 0; + if (!(optargs_bitmask & GUESTFS_XFS_GROWFS_LOGSEC_BITMASK)) + logsec = 0; + if (!(optargs_bitmask & GUESTFS_XFS_GROWFS_RTSEC_BITMASK)) + rtsec = 0; + + if (datasec) + ADD_ARG (argv, i, "-d"); + if (logsec) + ADD_ARG (argv, i, "-l"); + if (rtsec) + ADD_ARG (argv, i, "-r"); + + if (optargs_bitmask & GUESTFS_XFS_GROWFS_DATASIZE_BITMASK) { + if (datasize < 0) { + reply_with_error ("datasize must be >= 0"); + goto error; + } + snprintf (datasize_s, sizeof datasize_s, "%" PRIi64, datasize); + ADD_ARG (argv, i, "-D"); + ADD_ARG (argv, i, datasize_s); + } + + if (optargs_bitmask & GUESTFS_XFS_GROWFS_LOGSIZE_BITMASK) { + if (logsize < 0) { + reply_with_error ("logsize must be >= 0"); + goto error; + } + snprintf(logsize_s, sizeof logsize_s, "%" PRIi64, logsize); + ADD_ARG (argv, i, "-L"); + ADD_ARG (argv, i, logsize_s); + } + + if (optargs_bitmask & GUESTFS_XFS_GROWFS_RTSIZE_BITMASK) { + if (rtsize < 0) { + reply_with_error ("rtsize must be >= 0"); + goto error; + } + snprintf(rtsize_s, sizeof rtsize_s, "%" PRIi64, rtsize); + ADD_ARG (argv, i, "-R"); + ADD_ARG (argv, i, rtsize_s); + } + + if (optargs_bitmask & GUESTFS_XFS_GROWFS_RTEXTSIZE_BITMASK) { + if (rtextsize < 0) { + reply_with_error ("rtextsize must be >= 0"); + goto error; + } + snprintf(rtextsize_s, sizeof rtextsize_s, "%" PRIi64, rtextsize); + ADD_ARG (argv, i, "-e"); + ADD_ARG (argv, i, rtextsize_s); + } + + if (optargs_bitmask & GUESTFS_XFS_GROWFS_MAXPCT_BITMASK) { + if (maxpct < 0) { + reply_with_error ("maxpct must be >= 0"); + goto error; + } + snprintf(maxpct_s, sizeof maxpct_s, "%" PRIi32, maxpct); + ADD_ARG (argv, i, "-m"); + ADD_ARG (argv, i, maxpct_s); + } + + ADD_ARG (argv, i, buf); + ADD_ARG (argv, i, NULL); + + r = commandv (&out, &err, argv); + free (buf); + if (r == -1) { + reply_with_error ("%s: %s", path, err); + goto error; + } + + free (err); + return out; + +error: + if (buf) free (buf); + if (err) free (err); + return NULL; +} diff --git a/generator/generator_actions.ml b/generator/generator_actions.ml index e4956f7..d37339b 100644 --- a/generator/generator_actions.ml +++ b/generator/generator_actions.ml @@ -9051,6 +9051,34 @@ This returns the kernel version of the appliance, where this is available. This information is only useful for debugging. Nothing in the returned structure is defined by the API." }; + { defaults with + name = "xfs_growfs"; + style = RString "info", [Pathname "path"], [OBool "datasec"; OBool "logsec"; OBool "rtsec"; OInt64 "datasize"; OInt64 "logsize"; OInt64 "rtsize"; OInt64 "rtextsize"; OInt "maxpct"]; + proc_nr = Some 343; + optional = Some "xfs"; + tests = [ + InitEmpty, IfAvailable "xfs", TestOutputStruct ( + [["part_disk"; "/dev/sda"; "mbr"]; + ["pvcreate"; "/dev/sda1"]; + ["vgcreate"; "VG"; "/dev/sda1"]; + ["lvcreate"; "LV"; "VG"; "40"]; + ["mkfs"; "xfs"; "/dev/VG/LV"; ""; "NOARG"; ""; ""]; + ["lvresize"; "/dev/VG/LV"; "80"]; + ["mount_options"; ""; "/dev/VG/LV"; "/"]; + ["xfs_growfs"; "/"; "true"; "false"; "false"; ""; ""; ""; ""; ""]; + ["xfs_info"; "/"]], + [CompareWithInt ("xfs_blocksize", 20480); + ]) + ]; + shortdesc = "expand a existing XFS filesystem"; + longdesc = "\ +The C<path> argument is the pathname of the directory where +the filesystem is mounted. The filesystem must be mounted to be grown. + +The returned struct contains geometry information. Missing +fields are returned as C<-1> (for numeric fields) or empty +string." }; + ] (* Non-API meta-commands available only in guestfish. diff --git a/gobject/Makefile.inc b/gobject/Makefile.inc index 7a60933..3129275 100644 --- a/gobject/Makefile.inc +++ b/gobject/Makefile.inc @@ -65,7 +65,8 @@ guestfs_gobject_headers= \ include/guestfs-gobject/optargs-mkfs_btrfs.h \ include/guestfs-gobject/optargs-set_e2attrs.h \ include/guestfs-gobject/optargs-btrfs_fsck.h \ - include/guestfs-gobject/optargs-fstrim.h + include/guestfs-gobject/optargs-fstrim.h \ + include/guestfs-gobject/optargs-xfs_growfs.h guestfs_gobject_sources= \ src/session.c \ @@ -112,4 +113,5 @@ guestfs_gobject_sources= \ src/optargs-mkfs_btrfs.c \ src/optargs-set_e2attrs.c \ src/optargs-btrfs_fsck.c \ - src/optargs-fstrim.c + src/optargs-fstrim.c \ + src/optargs-xfs_growfs.c diff --git a/po/POTFILES b/po/POTFILES index cdb873e..ada0da8 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -160,6 +160,7 @@ gobject/src/optargs-set_e2attrs.c gobject/src/optargs-tune2fs.c gobject/src/optargs-umount.c gobject/src/optargs-umount_local.c +gobject/src/optargs-xfs_growfs.c gobject/src/session.c gobject/src/struct-application.c gobject/src/struct-btrfssubvolume.c diff --git a/src/MAX_PROC_NR b/src/MAX_PROC_NR index c9693eb..fe2cd8b 100644 --- a/src/MAX_PROC_NR +++ b/src/MAX_PROC_NR @@ -1 +1 @@ -342 +343 -- 1.7.12.rc1