1 files changed, 15 insertions, 14 deletions

diff --git a/fs/jffs2/file.c b/fs/jffs2/file.c
index 8279bf0133ff..935f273dc57b 100644
--- a/fs/jffs2/file.c
+++ b/fs/jffs2/file.c
@@ -7,7 +7,7 @@
  *
  * For licensing information, see the file 'LICENCE' in this directory.
  *
- * $Id: file.c,v 1.102 2005/07/06 12:13:09 dwmw2 Exp $
+ * $Id: file.c,v 1.104 2005/10/18 23:29:35 tpoynor Exp $
  *
  */
 
@@ -34,8 +34,8 @@ int jffs2_fsync(struct file *filp, struct dentry *dentry, int datasync)
 
         /* Trigger GC to flush any pending writes for this inode */
         jffs2_flush_wbuf_gc(c, inode->i_ino);
-                        
-        return 0;       
+
+        return 0;
 }
 
 struct file_operations jffs2_file_operations =
@@ -107,7 +107,7 @@ static int jffs2_readpage (struct file *filp, struct page *pg)
 {
         struct jffs2_inode_info *f = JFFS2_INODE_INFO(pg->mapping->host);
         int ret;
-        
+
         down(&f->sem);
         ret = jffs2_do_readpage_unlock(pg->mapping->host, pg);
         up(&f->sem);
@@ -130,11 +130,12 @@ static int jffs2_prepare_write (struct file *filp, struct page *pg,
                 struct jffs2_raw_inode ri;
                 struct jffs2_full_dnode *fn;
                 uint32_t phys_ofs, alloc_len;
-                
+
                 D1(printk(KERN_DEBUG "Writing new hole frag 0x%x-0x%x between current EOF and new page\n",
                           (unsigned int)inode->i_size, pageofs));
 
-                ret = jffs2_reserve_space(c, sizeof(ri), &phys_ofs, &alloc_len, ALLOC_NORMAL);
+                ret = jffs2_reserve_space(c, sizeof(ri), &phys_ofs, &alloc_len,
+                                        ALLOC_NORMAL, JFFS2_SUMMARY_INODE_SIZE);
                 if (ret)
                         return ret;
 
@@ -159,7 +160,7 @@ static int jffs2_prepare_write (struct file *filp, struct page *pg,
                 ri.compr = JFFS2_COMPR_ZERO;
                 ri.node_crc = cpu_to_je32(crc32(0, &ri, sizeof(ri)-8));
                 ri.data_crc = cpu_to_je32(0);
-                
+
                 fn = jffs2_write_dnode(c, f, &ri, NULL, 0, phys_ofs, ALLOC_NORMAL);
 
                 if (IS_ERR(fn)) {
@@ -186,7 +187,7 @@ static int jffs2_prepare_write (struct file *filp, struct page *pg,
                 inode->i_size = pageofs;
                 up(&f->sem);
         }
-        
+
         /* Read in the page if it wasn't already present, unless it's a whole page */
         if (!PageUptodate(pg) && (start || end < PAGE_CACHE_SIZE)) {
                 down(&f->sem);
@@ -217,7 +218,7 @@ static int jffs2_commit_write (struct file *filp, struct page *pg,
         if (!start && end == PAGE_CACHE_SIZE) {
                 /* We need to avoid deadlock with page_cache_read() in
                    jffs2_garbage_collect_pass(). So we have to mark the
-                   page up to date, to prevent page_cache_read() from 
+                   page up to date, to prevent page_cache_read() from
                    trying to re-lock it. */
                 SetPageUptodate(pg);
         }
@@ -251,7 +252,7 @@ static int jffs2_commit_write (struct file *filp, struct page *pg,
                 /* There was an error writing. */
                 SetPageError(pg);
         }
-        
+
         /* Adjust writtenlen for the padding we did, so we don't confuse our caller */
         if (writtenlen < (start&3))
                 writtenlen = 0;
@@ -262,7 +263,7 @@ static int jffs2_commit_write (struct file *filp, struct page *pg,
                 if (inode->i_size < (pg->index << PAGE_CACHE_SHIFT) + start + writtenlen) {
                         inode->i_size = (pg->index << PAGE_CACHE_SHIFT) + start + writtenlen;
                         inode->i_blocks = (inode->i_size + 511) >> 9;
-                        
+
                         inode->i_ctime = inode->i_mtime = ITIME(je32_to_cpu(ri->ctime));
                 }
         }
@@ -271,13 +272,13 @@ static int jffs2_commit_write (struct file *filp, struct page *pg,
 
         if (start+writtenlen < end) {
                 /* generic_file_write has written more to the page cache than we've
-                   actually written to the medium. Mark the page !Uptodate so that 
+                   actually written to the medium. Mark the page !Uptodate so that
                    it gets reread */
                 D1(printk(KERN_DEBUG "jffs2_commit_write(): Not all bytes written. Marking page !uptodate\n"));
                 SetPageError(pg);
                 ClearPageUptodate(pg);
         }
 
-        D1(printk(KERN_DEBUG "jffs2_commit_write() returning %d\n",writtenlen?writtenlen:ret));
-        return writtenlen?writtenlen:ret;
+        D1(printk(KERN_DEBUG "jffs2_commit_write() returning %d\n",start+writtenlen==end?0:ret));
+        return start+writtenlen==end?0:ret;
 }