All of lore.kernel.org
 help / color / mirror / Atom feed
From: Anton Vorontsov <anton.vorontsov@linaro.org>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Kees Cook <keescook@chromium.org>,
	Colin Cross <ccross@android.com>, Tony Luck <tony.luck@intel.com>
Cc: Arnd Bergmann <arnd@arndb.de>,
	John Stultz <john.stultz@linaro.org>,
	Shuah Khan <shuahkhan@gmail.com>,
	arve@android.com, Rebecca Schultz Zavin <rebecca@android.com>,
	Jesper Juhl <jj@chaosbits.net>,
	Randy Dunlap <rdunlap@xenotime.net>,
	Stephen Boyd <sboyd@codeaurora.org>,
	Thomas Meyer <thomas@m3y3r.de>,
	Andrew Morton <akpm@linux-foundation.org>,
	Marco Stornelli <marco.stornelli@gmail.com>,
	WANG Cong <xiyou.wangcong@gmail.com>,
	linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org,
	linaro-kernel@lists.linaro.org, patches@linaro.org,
	kernel-team@android.com
Subject: [PATCH 08/14] pstore/ram: Factor ramoops_get_dump_prz() out of ramoops_pstore_read()
Date: Fri, 18 May 2012 15:25:34 -0700	[thread overview]
Message-ID: <20120518222534.GH23089@lizard> (raw)
In-Reply-To: <20120518222314.GA9425@lizard>

This will help make code clearer when we'll add support for other
message types.

The patch also changes return value from -EINVAL to 0 in case of
end-of-records. The exact value doesn't matter for pstore (it should
be just <= 0), but 0 feels more correct.

Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
---
 fs/pstore/ram.c |   28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c
index db0e118..54e0676 100644
--- a/fs/pstore/ram.c
+++ b/fs/pstore/ram.c
@@ -86,6 +86,24 @@ static int ramoops_pstore_open(struct pstore_info *psi)
 	return 0;
 }
 
+static struct persistent_ram_zone *
+ramoops_get_dump_prz(u64 id, enum pstore_type_id *type,
+		     struct ramoops_context *cxt)
+{
+	struct persistent_ram_zone *prz;
+
+	if (id > cxt->max_dump_count)
+		return NULL;
+
+	prz = cxt->przs[id];
+	if (!persistent_ram_old_size(prz))
+		return NULL;
+
+	*type = PSTORE_TYPE_DMESG;
+
+	return prz;
+}
+
 static ssize_t ramoops_pstore_read(u64 *id, enum pstore_type_id *type,
 				   struct timespec *time,
 				   char **buf,
@@ -95,14 +113,12 @@ static ssize_t ramoops_pstore_read(u64 *id, enum pstore_type_id *type,
 	struct ramoops_context *cxt = psi->data;
 	struct persistent_ram_zone *prz;
 
-	if (cxt->read_count >= cxt->max_dump_count)
-		return -EINVAL;
-
 	*id = cxt->read_count++;
-	prz = cxt->przs[*id];
 
-	/* Only supports dmesg output so far. */
-	*type = PSTORE_TYPE_DMESG;
+	prz = ramoops_get_dump_prz(*id, type, cxt);
+	if (!prz)
+		return 0;
+
 	/* TODO(kees): Bogus time for the moment. */
 	time->tv_sec = 0;
 	time->tv_nsec = 0;
-- 
1.7.9.2


  parent reply	other threads:[~2012-05-18 22:27 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-18 22:23 [PATCH v3 0/14] Merge ram_console into pstore, and more Anton Vorontsov
2012-05-18 22:24 ` [PATCH 01/14] pstore/inode: Make pstore_fill_super() static Anton Vorontsov
2012-05-18 22:24 ` [PATCH 02/14] pstore/ram: Should update old dmesg buffer before reading Anton Vorontsov
2012-05-18 23:55   ` Colin Cross
2012-05-18 22:24 ` [PATCH 03/14] pstore/ram_core: Do not reset restored zone's position and size Anton Vorontsov
2012-05-18 23:42   ` Colin Cross
2012-05-22 13:19     ` Anton Vorontsov
2012-05-18 22:24 ` [PATCH 04/14] pstore/ram: Should zap persistent zone on unlink Anton Vorontsov
2012-05-18 23:52   ` Colin Cross
2012-05-18 22:25 ` [PATCH 05/14] pstore: Add console log messages support Anton Vorontsov
2012-05-18 22:25 ` [PATCH 06/14] pstore/ram: Introduce ramoops_context.max_dump_count Anton Vorontsov
2012-05-18 22:25 ` [PATCH 07/14] pstore/ram: Factor dmesg przs initialization out of probe() Anton Vorontsov
2012-05-18 22:25 ` Anton Vorontsov [this message]
2012-05-18 22:25 ` [PATCH 09/14] pstore/ram: Add console messages handling Anton Vorontsov
2012-05-18 22:25 ` [PATCH 10/14] pstore/ram_core: Silence some printks Anton Vorontsov
2012-05-18 22:26 ` [PATCH 11/14] pstore/ram: Add some more documentation and examples Anton Vorontsov
2012-05-18 22:26 ` [PATCH 12/14] staging/android: Remove ram_console driver Anton Vorontsov
2012-05-18 22:26 ` [PATCH 13/14] pstore/ram_core: Remove now unused code Anton Vorontsov
2012-05-18 22:26 ` [PATCH 14/14] pstore/platform: Remove automatic updates Anton Vorontsov
2012-05-21 19:59   ` Kees Cook
2012-05-22  4:54     ` Anton Vorontsov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20120518222534.GH23089@lizard \
    --to=anton.vorontsov@linaro.org \
    --cc=akpm@linux-foundation.org \
    --cc=arnd@arndb.de \
    --cc=arve@android.com \
    --cc=ccross@android.com \
    --cc=devel@driverdev.osuosl.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=jj@chaosbits.net \
    --cc=john.stultz@linaro.org \
    --cc=keescook@chromium.org \
    --cc=kernel-team@android.com \
    --cc=linaro-kernel@lists.linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=marco.stornelli@gmail.com \
    --cc=patches@linaro.org \
    --cc=rdunlap@xenotime.net \
    --cc=rebecca@android.com \
    --cc=sboyd@codeaurora.org \
    --cc=shuahkhan@gmail.com \
    --cc=thomas@m3y3r.de \
    --cc=tony.luck@intel.com \
    --cc=xiyou.wangcong@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.