lkml.org 
[lkml]   [2012]   [Mar]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [Patch]Introduce get_reason_str() to pstore
On Fri, 16 Mar 2012 13:01:49 -0400 Seiji Aguchi <seiji.aguchi@hds.com> wrote:

> Hi,
>
> Recently, there has been some changes in kmsg_dump() below and they have been applied to linus-tree.
> (1) kmsg_dump(KMSG_DUMP_KEXEC) was removed.
> http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=commitdiff;h=a3dd3323058d281abd584b15ad4c5b65064d7a61
>
> (2) A order of "enum kmsg_dump_reason" was modified.
> http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=commitdiff;h=c22ab332902333f83766017478c1ef6607ace681
>
> This patch removes reason_str array and add get_reason_str() in accordance with Adrian's comment below.
> https://lkml.org/lkml/2012/3/16/63
>
> Signed-off-by: Seiji Aguchi <seiji.aguchi@hds.com>
> Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
>
> ---
> fs/pstore/platform.c | 30 ++++++++++++++++++++++--------
> 1 files changed, 22 insertions(+), 8 deletions(-)
>
> diff --git a/fs/pstore/platform.c b/fs/pstore/platform.c index 9ec22d3..82c585f 100644
> --- a/fs/pstore/platform.c
> +++ b/fs/pstore/platform.c
> @@ -68,9 +68,25 @@ void pstore_set_kmsg_bytes(int bytes)
> /* Tag each group of saved records with a sequence number */
> static int oopscount;
>
> -static char *reason_str[] = {
> - "Oops", "Panic", "Kexec", "Restart", "Halt", "Poweroff", "Emergency"
> -};
> +static const char *get_reason_str(enum kmsg_dump_reason reason) {
> + switch (reason) {
> + case KMSG_DUMP_PANIC:
> + return "Panic";
> + case KMSG_DUMP_OOPS:
> + return "Oops";
> + case KMSG_DUMP_EMERG:
> + return "Emergency";
> + case KMSG_DUMP_RESTART:
> + return "Restart";
> + case KMSG_DUMP_HALT:
> + return "Halt";
> + case KMSG_DUMP_POWEROFF:
> + return "Poweroff";
> + default:
> + return "Unknown";
> + }
> +}

Better:

static char *reason_str[] = {
[KMSG_DUMP_OOPS] = "Oops",
[KMSG_DUMP_PANIC] = "Panic",
...
[KMSG_DUMP_POWEROFF] = "Poweroff",
};


\
 
 \ /
  Last update: 2012-03-24 08:09    [from the cache]
©2003-2011 Jasper Spaans