Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / fs / jffs2 / writev.c

diff --git a/fs/jffs2/writev.c b/fs/jffs2/writev.c
index 80cd382..c638ae1 100644 (file)
--- a/fs/jffs2/writev.c
+++ b/fs/jffs2/writev.c
@@ -3,11 +3,11 @@
  *
  * Copyright (C) 2001, 2002 Red Hat, Inc.
  *
- * Created by David Woodhouse <dwmw2@redhat.com>
+ * Created by David Woodhouse <dwmw2@infradead.org>
  *
  * For licensing information, see the file 'LICENCE' in this directory.
  *
- * $Id: writev.c,v 1.4 2003/10/04 08:33:07 dwmw2 Exp $
+ * $Id: writev.c,v 1.8 2005/09/09 15:11:58 havasi Exp $
  *
  */
 
@@ -18,7 +18,7 @@
 /* This ought to be in core MTD code. All registered MTD devices
    without writev should have this put in place. Bug the MTD
    maintainer */
-static inline int mtd_fake_writev(struct mtd_info *mtd, const struct iovec *vecs,
+static inline int mtd_fake_writev(struct mtd_info *mtd, const struct kvec *vecs,
                                  unsigned long count, loff_t to, size_t *retlen)
 {
        unsigned long i;
@@ -39,12 +39,43 @@ static inline int mtd_fake_writev(struct mtd_info *mtd, const struct iovec *vecs
        return ret;
 }
 
-int jffs2_flash_direct_writev(struct jffs2_sb_info *c, const struct iovec *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 (!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
+       else {
                return mtd_fake_writev(c->mtd, vecs, count, to, retlen);
+       }
 }
 
+int jffs2_flash_direct_write(struct jffs2_sb_info *c, loff_t ofs, size_t len,
+                       size_t *retlen, const u_char *buf)
+{
+       int ret;
+       ret = c->mtd->write(c->mtd, ofs, len, retlen, buf);
+
+       if (jffs2_sum_active()) {
+               struct kvec vecs[1];
+               int res;
+
+               vecs[0].iov_base = (unsigned char *) buf;
+               vecs[0].iov_len = len;
+
+               res = jffs2_sum_add_kvec(c, vecs, 1, (uint32_t) ofs);
+               if (res) {
+                       return res;
+               }
+       }
+       return ret;
+}