search for: flush_io_err

...IZE> path SCRATCH_DEV + devid <DEVID> size <SIZE> used <SIZE> path SCRATCH_DEV == Sync filesystem FSSync ''SCRATCH_MNT'' == Show device stats by mountpoint - <NUMDEVS> [SCRATCH_DEV].corruption_errs <NUM> - <NUMDEVS> [SCRATCH_DEV].flush_io_errs <NUM> - <NUMDEVS> [SCRATCH_DEV].generation_errs <NUM> - <NUMDEVS> [SCRATCH_DEV].read_io_errs <NUM> - <NUMDEVS> [SCRATCH_DEV].write_io_errs <NUM> + <NUMDEVS> [SCRATCH_DEV].corruption_errs <NUM> + <NUMDEVS> [SCRATCH_DE...

...+ if (r == -1) { >> + reply_with_error ("%s: %s", path, err); >> + return NULL; >> + } >> + >> + /* Output pattern is: >> + * >> + * [/dev/sda].write_io_errs 0 >> + * [/dev/sda].read_io_errs 0 >> + * [/dev/sda].flush_io_errs 0 >> + * [/dev/sda].corruption_errs 0 >> + * [/dev/sda].generation_errs 0 >> + * >> + */ >> + >> + /* Read the lines and split into "key: value". */ >> + p = analyze_line(out, &key, &value, ' '); >> + while(key...

Mofify the function from a fixed delimiter to a variable. So, it can be used in more APIs later. Also modified the existing callers Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com> --- daemon/btrfs.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/daemon/btrfs.c b/daemon/btrfs.c index 39392f7..caa28ca 100644 --- a/daemon/btrfs.c +++ b/daemon/btrfs.c @@

Mofify the function from a fixed delimiter to a variable. So, it can be used in more APIs later. Also modified the existing callers Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com> --- daemon/btrfs.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/daemon/btrfs.c b/daemon/btrfs.c index 39392f7..caa28ca 100644 --- a/daemon/btrfs.c +++ b/daemon/btrfs.c @@

...+ } + + ADD_ARG (argv, i, NULL); + + r = commandv (&out, &err, argv); + if (r == -1) { + reply_with_error ("%s: %s", path, err); + return NULL; + } + + /* Output pattern is: + * + * [/dev/sda].write_io_errs 0 + * [/dev/sda].read_io_errs 0 + * [/dev/sda].flush_io_errs 0 + * [/dev/sda].corruption_errs 0 + * [/dev/sda].generation_errs 0 + * + */ + + /* Read the lines and split into "key: value". */ + p = analyze_line(out, &key, &value, ' '); + while(key) + { + if (add_string (&ret, key) == -1) + return NULL; +...

...it better to just return the name of the attribute, i.e. > > write_io_errs > > ? > > In the condition that the btrfs have multi devices, its original output > is going to this way: > [/dev/sda].write_io_errs 0 > [/dev/sda].read_io_errs 0 > [/dev/sda].flush_io_errs 0 > [/dev/sda].corruption_errs 0 > [/dev/sda].generation_errs 0 > [/dev/sdb].write_io_errs 0 > [/dev/sdb].read_io_errs 0 > [/dev/sdb].flush_io_errs 0 > [/dev/sdb].corruption_errs 0 > [/dev/sdb].generation_errs 0 > [/dev/sdc]... > [/dev...

...i, buf); + ADD_ARG (argv, i, NULL); + + r = commandv (&out, &err, argv); + if (r == -1) { + reply_with_error ("%s: %s", path, err); + return NULL; + } + + /* Output pattern is: + * [/dev/sda].write_io_errs 0 + * [/dev/sda].read_io_errs 0 + * [/dev/sda].flush_io_errs 0 + * [/dev/sda].corruption_errs 0 + * [/dev/sda].generation_errs 0 + * [/dev/sdb].write_io_errs 0 + * [/dev/sdb].read_io_errs 0 + * [/dev/sdb].flush_io_errs 0 + * [/dev/sdb].corruption_errs 0 + * [/dev/sdb].generation_errs 0 + * [/dev/sdc]... + * ... +...

...i, buf); + ADD_ARG (argv, i, NULL); + + r = commandv (&out, &err, argv); + if (r == -1) { + reply_with_error ("%s: %s", path, err); + return NULL; + } + + /* Output pattern is: + * [/dev/sda].write_io_errs 0 + * [/dev/sda].read_io_errs 0 + * [/dev/sda].flush_io_errs 0 + * [/dev/sda].corruption_errs 0 + * [/dev/sda].generation_errs 0 + * [/dev/sdb].write_io_errs 0 + * [/dev/sdb].read_io_errs 0 + * [/dev/sdb].flush_io_errs 0 + * [/dev/sdb].corruption_errs 0 + * [/dev/sdb].generation_errs 0 + * [/dev/sdc]... + * ... +...

...e of the attribute, i.e. >>> write_io_errs >>> ? >> >> In the condition that the btrfs have multi devices, its original output >> is going to this way: >> [/dev/sda].write_io_errs 0 >> [/dev/sda].read_io_errs 0 >> [/dev/sda].flush_io_errs 0 >> [/dev/sda].corruption_errs 0 >> [/dev/sda].generation_errs 0 >> [/dev/sdb].write_io_errs 0 >> [/dev/sdb].read_io_errs 0 >> [/dev/sdb].flush_io_errs 0 >> [/dev/sdb].corruption_errs 0 >> [/dev/sdb].generation_errs 0...

Mofify the function from fixed dilemiter to variabler. So, it could be used in more APIs later. Also modified the existed caller Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com> --- daemon/btrfs.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/daemon/btrfs.c b/daemon/btrfs.c index 39392f7..caa28ca 100644 --- a/daemon/btrfs.c +++ b/daemon/btrfs.c @@

...dv (&out, &err, argv); > + if (r == -1) { > + reply_with_error ("%s: %s", path, err); > + return NULL; > + } > + > + /* Output pattern is: > + * > + * [/dev/sda].write_io_errs 0 > + * [/dev/sda].read_io_errs 0 > + * [/dev/sda].flush_io_errs 0 > + * [/dev/sda].corruption_errs 0 > + * [/dev/sda].generation_errs 0 > + * > + */ > + > + /* Read the lines and split into "key: value". */ > + p = analyze_line(out, &key, &value, ' '); > + while(key) > + { Curly bracket goes...