mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: dragos.tatulea@intel.com
To: ccross@android.com, keescook@chromium.org, tony.luck@intel.com,
	cbouatmailru@gmail.com, linux-kernel@vger.kernel.org
Cc: adrian.hunter@intel.com, octavian.purdila@intel.com,
	Dragos Tatulea <dragos.tatulea@intel.com>
Subject: [PATCH v2 7/8] pstore: make sure pstore_write exists on flush error
Date: Thu, 18 Oct 2012 11:28:27 +0300	[thread overview]
Message-ID: <1350548908-24407-8-git-send-email-dragos.tatulea@intel.com> (raw)
In-Reply-To: <1350548908-24407-1-git-send-email-dragos.tatulea@intel.com>

From: Dragos Tatulea <dragos.tatulea@intel.com>

Return error if flushing to backend failed.

Signed-off-by: Dragos Tatulea <dragos.tatulea@intel.com>
---
 fs/pstore/platform.c |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/fs/pstore/platform.c b/fs/pstore/platform.c
index 3a4c38f..25f59ed 100644
--- a/fs/pstore/platform.c
+++ b/fs/pstore/platform.c
@@ -445,7 +445,7 @@ void pstore_del_timer(void)
 int pstore_write(enum pstore_type_id type, const char *buf, size_t size)
 {
 	size_t len;
-	int err = 0, err2;
+	int err = 0;
 
 	if (!psinfo)
 		return -ENODEV;
@@ -461,16 +461,14 @@ int pstore_write(enum pstore_type_id type, const char *buf, size_t size)
 		psinfo->ext_part = 1;
 	}
 
-	while (size) {
+	while (size && !err) {
 		len = min(size, psinfo->bufsize - psinfo->ext_len);
 		memcpy(psinfo->buf + psinfo->ext_len, buf, len);
 		psinfo->ext_len += len;
 		buf += len;
 		size -= len;
 		if (psinfo->ext_len == psinfo->bufsize) {
-			err2 = pstore_ext_flush();
-			if (err2 && !err)
-				err = err2;
+			err = pstore_ext_flush();
 		}
 	}
 
-- 
1.7.9.5


  parent reply	other threads:[~2012-10-18  8:25 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-10-18  8:28 [PATCH v2 0/8] pstore: add interface for dumpers and add task list dumper dragos.tatulea
2012-10-18  8:28 ` [PATCH v2 1/8] pstore: add flags dragos.tatulea
2012-10-18  8:28 ` [PATCH v2 2/8] pstore: add debugfs support for causing dumps and panics dragos.tatulea
2012-10-18  8:28 ` [PATCH v2 3/8] pstore: add support for external writers dragos.tatulea
2012-10-18  8:28 ` [PATCH v2 4/8] pstore: allow storing different type id's in ram backend dragos.tatulea
2012-10-18  8:28 ` [PATCH v2 5/8] pstore: add task list dumper dragos.tatulea
2012-10-18  8:28 ` [PATCH v2 6/8] pstore: do not run timer while pstore is not mounted dragos.tatulea
2012-10-18  8:28 ` dragos.tatulea [this message]
2012-10-18  8:28 ` [PATCH v2 8/8] pstore: max out console log level during sysfs dump switch dragos.tatulea

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=1350548908-24407-8-git-send-email-dragos.tatulea@intel.com \
    --to=dragos.tatulea@intel.com \
    --cc=adrian.hunter@intel.com \
    --cc=cbouatmailru@gmail.com \
    --cc=ccross@android.com \
    --cc=keescook@chromium.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=octavian.purdila@intel.com \
    --cc=tony.luck@intel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®