summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorFerenc Havasi <havasi@inf.u-szeged.hu>2005-09-09 16:12:01 +0100
committerThomas Gleixner <tglx@mtd.linutronix.de>2005-11-06 21:37:07 +0100
commit8acff5e93488e4da653097bd5e50662ee0985867 (patch)
tree90172da041ac2b11dc3fc0e881146b6c50b290db /fs
parent1b01d9798d58bf28a40fede184482ebf39e63335 (diff)
downloadop-kernel-dev-8acff5e93488e4da653097bd5e50662ee0985867.zip
op-kernel-dev-8acff5e93488e4da653097bd5e50662ee0985867.tar.gz
[JFFS2] Call summary collector for all mtd devices with writev support
Do the summary collection in the right place. If the device was not writebuffered but had c->mtd->writev function (e.g. blkmtd) the summary collector function was not called. Signed-off-by: Ferenc Havasi <havasi@inf.u-szeged.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'fs')
-rw-r--r--fs/jffs2/writev.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/fs/jffs2/writev.c b/fs/jffs2/writev.c
index 6d8c27c..c638ae1 100644
--- a/fs/jffs2/writev.c
+++ b/fs/jffs2/writev.c
@@ -7,7 +7,7 @@
*
* For licensing information, see the file 'LICENCE' in this directory.
*
- * $Id: writev.c,v 1.7 2005/09/07 08:34:55 havasi Exp $
+ * $Id: writev.c,v 1.8 2005/09/09 15:11:58 havasi Exp $
*
*/
@@ -42,18 +42,19 @@ static inline int mtd_fake_writev(struct mtd_info *mtd, const struct kvec *vecs,
int jffs2_flash_direct_writev(struct jffs2_sb_info *c, const struct kvec *vecs,
unsigned long count, loff_t to, size_t *retlen)
{
- if (c->mtd->writev)
- return c->mtd->writev(c->mtd, vecs, count, to, retlen);
- else {
+ if (!jffs2_is_writebuffered(c)) {
if (jffs2_sum_active()) {
int res;
-
res = jffs2_sum_add_kvec(c, vecs, count, (uint32_t) to);
if (res) {
return res;
}
}
+ }
+ if (c->mtd->writev)
+ return c->mtd->writev(c->mtd, vecs, count, to, retlen);
+ else {
return mtd_fake_writev(c->mtd, vecs, count, to, retlen);
}
}
OpenPOWER on IntegriCloud