[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1350558367-31801-8-git-send-email-dragos.tatulea@intel.com>
Date: Thu, 18 Oct 2012 14:06:05 +0300
From: dragos.tatulea@...el.com
To: ccross@...roid.com, keescook@...omium.org, tony.luck@...el.com,
cbouatmailru@...il.com, linux-kernel@...r.kernel.org
Cc: adrian.hunter@...el.com, octavian.purdila@...el.com,
Dragos Tatulea <dragos.tatulea@...el.com>
Subject: [PATCH v3 7/9] pstore: make sure pstore_write exists on flush error
From: Dragos Tatulea <dragos.tatulea@...el.com>
Return error if flushing to backend failed.
Signed-off-by: Dragos Tatulea <dragos.tatulea@...el.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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists