Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752440AbaDDD55 (ORCPT ); Thu, 3 Apr 2014 23:57:57 -0400 Received: from mga09.intel.com ([134.134.136.24]:36745 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752261AbaDDD5I (ORCPT ); Thu, 3 Apr 2014 23:57:08 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.97,792,1389772800"; d="scan'208";a="514581787" From: Liu ShuoX To: linux-kernel@vger.kernel.org Cc: yanmin_zhang@linux.intel.com, keescook@chromium.org, tony.luck@intel.com, fengguang.wu@intel.com, Liu ShuoX , Zhang Yanmin , Anton Vorontsov , Colin Cross Subject: [PATCH v3 2/3] pstore: add seq_ops for norm zone Date: Fri, 4 Apr 2014 11:55:58 +0800 Message-Id: <1396583760-4772-3-git-send-email-shuox.liu@intel.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1396583760-4772-1-git-send-email-shuox.liu@intel.com> References: <1396583760-4772-1-git-send-email-shuox.liu@intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Some developers want to output the pstore record trace flexible. So add seq_ops into ramoops_zone in case users would make private output format. Signed-off-by: Zhang Yanmin Signed-off-by: Liu ShuoX --- fs/pstore/inode.c | 10 ++++++++-- include/linux/pstore_ramoops.h | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/fs/pstore/inode.c b/fs/pstore/inode.c index d463481..a9c9782 100644 --- a/fs/pstore/inode.c +++ b/fs/pstore/inode.c @@ -207,14 +207,20 @@ static ssize_t pstore_file_read(struct file *file, char __user *userbuf, static int pstore_file_open(struct inode *inode, struct file *file) { struct pstore_private *ps = inode->i_private; + struct ramoops_context *cxt = ps->psi->data; + struct ramoops_zone *zones = cxt ? cxt->zones : NULL; struct seq_file *sf; int err; const struct seq_operations *sops = NULL; if (ps->type == PSTORE_TYPE_FTRACE) sops = &pstore_ftrace_seq_ops; - if (ps->type == PSTORE_TYPE_NORM) - sops = &pstore_seq_ops; + if (ps->type == PSTORE_TYPE_NORM && zones) { + if (zones[ps->id].seq_ops) + sops = zones[ps->id].seq_ops; + else + sops = &pstore_seq_ops; + } err = seq_open(file, sops); if (err < 0) diff --git a/include/linux/pstore_ramoops.h b/include/linux/pstore_ramoops.h index 423aacc..f021a94 100644 --- a/include/linux/pstore_ramoops.h +++ b/include/linux/pstore_ramoops.h @@ -33,6 +33,7 @@ struct ramoops_zone { int item_size; void (*print_record)(struct seq_file *s, void *record); void *(*get_new_record)(struct persistent_ram_zone *prz); + const struct seq_operations *seq_ops; }; /* -- 1.8.3.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/