I've removed this patch in the mean time. It was needed to build the
usage string
for btrfs fi props at runtime but I found a solution to do this at
compile time now.
On Sun, Jun 24, 2012 at 11:20 PM, Alexander Block
<ablock84@xxxxxxxxxxxxxx> wrote:
> Make filesystem_cmd_group non const so that btrfs fi prop can
> generate the usage string at runtime. The commands member of
> struct cmd_group is also non const now.
>
> Signed-off-by: Alexander Block <ablock84@xxxxxxxxxxxxxx>
> ---
> cmds-filesystem.c | 2 +-
> commands.h | 4 ++--
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/cmds-filesystem.c b/cmds-filesystem.c
> index a8f63b3..4c61233 100644
> --- a/cmds-filesystem.c
> +++ b/cmds-filesystem.c
> @@ -536,7 +536,7 @@ static int cmd_label(int argc, char **argv)
> }
> }
>
> -const struct cmd_group filesystem_cmd_group = {
> +struct cmd_group filesystem_cmd_group = {
> filesystem_cmd_group_usage, NULL, {
> { "df", cmd_df, cmd_df_usage, NULL, 0 },
> { "show", cmd_show, cmd_show_usage, NULL, 0 },
> diff --git a/commands.h b/commands.h
> index 64acf17..9405806 100644
> --- a/commands.h
> +++ b/commands.h
> @@ -54,7 +54,7 @@ struct cmd_group {
> const char * const *usagestr;
> const char *infostr;
>
> - const struct cmd_struct commands[];
> + struct cmd_struct commands[];
> };
>
> /* btrfs.c */
> @@ -81,7 +81,7 @@ void help_command_group(const struct cmd_group *grp, int argc, char **argv);
> int open_file_or_dir(const char *fname);
>
> extern const struct cmd_group subvolume_cmd_group;
> -extern const struct cmd_group filesystem_cmd_group;
> +extern struct cmd_group filesystem_cmd_group;
> extern const struct cmd_group balance_cmd_group;
> extern const struct cmd_group device_cmd_group;
> extern const struct cmd_group scrub_cmd_group;
> --
> 1.7.10
>
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
