1 files changed, 8 insertions, 9 deletions

diff --git a/fs/jffs2/read.c b/fs/jffs2/read.c
index c7f9068907cf..f3b86da833ba 100644
--- a/fs/jffs2/read.c
+++ b/fs/jffs2/read.c
@@ -7,7 +7,7 @@
  *
  * For licensing information, see the file 'LICENCE' in this directory.
  *
- * $Id: read.c,v 1.39 2005/03/01 10:34:03 dedekind Exp $
+ * $Id: read.c,v 1.42 2005/11/07 11:14:41 gleixner Exp $
  *
  */
 
@@ -43,7 +43,7 @@ int jffs2_read_dnode(struct jffs2_sb_info *c, struct jffs2_inode_info *f,
         }
         if (readlen != sizeof(*ri)) {
                 jffs2_free_raw_inode(ri);
-                printk(KERN_WARNING "Short read from 0x%08x: wanted 0x%zx bytes, got 0x%zx\n", 
+                printk(KERN_WARNING "Short read from 0x%08x: wanted 0x%zx bytes, got 0x%zx\n",
                        ref_offset(fd->raw), sizeof(*ri), readlen);
                 return -EIO;
         }
@@ -61,7 +61,7 @@ int jffs2_read_dnode(struct jffs2_sb_info *c, struct jffs2_inode_info *f,
         }
         /* There was a bug where we wrote hole nodes out with csize/dsize
            swapped. Deal with it */
-        if (ri->compr == JFFS2_COMPR_ZERO && !je32_to_cpu(ri->dsize) && 
+        if (ri->compr == JFFS2_COMPR_ZERO && !je32_to_cpu(ri->dsize) &&
             je32_to_cpu(ri->csize)) {
                 ri->dsize = ri->csize;
                 ri->csize = cpu_to_je32(0);
@@ -74,7 +74,7 @@ int jffs2_read_dnode(struct jffs2_sb_info *c, struct jffs2_inode_info *f,
                 goto out_ri;
         });
 
-        
+
         if (ri->compr == JFFS2_COMPR_ZERO) {
                 memset(buf, 0, len);
                 goto out_ri;
@@ -82,8 +82,8 @@ int jffs2_read_dnode(struct jffs2_sb_info *c, struct jffs2_inode_info *f,
 
         /* Cases:
            Reading whole node and it's uncompressed - read directly to buffer provided, check CRC.
-           Reading whole node and it's compressed - read into comprbuf, check CRC and decompress to buffer provided 
-           Reading partial node and it's uncompressed - read into readbuf, check CRC, and copy 
+           Reading whole node and it's compressed - read into comprbuf, check CRC and decompress to buffer provided
+           Reading partial node and it's uncompressed - read into readbuf, check CRC, and copy
            Reading partial node and it's compressed - read into readbuf, check checksum, decompress to decomprbuf and copy
         */
         if (ri->compr == JFFS2_COMPR_NONE && len == je32_to_cpu(ri->dsize)) {
@@ -129,7 +129,7 @@ int jffs2_read_dnode(struct jffs2_sb_info *c, struct jffs2_inode_info *f,
         D2(printk(KERN_DEBUG "Data CRC matches calculated CRC %08x\n", crc));
         if (ri->compr != JFFS2_COMPR_NONE) {
                 D2(printk(KERN_DEBUG "Decompress %d bytes from %p to %d bytes at %p\n",
-                          je32_to_cpu(ri->csize), readbuf, je32_to_cpu(ri->dsize), decomprbuf)); 
+                          je32_to_cpu(ri->csize), readbuf, je32_to_cpu(ri->dsize), decomprbuf));
                 ret = jffs2_decompress(c, f, ri->compr | (ri->usercompr << 8), readbuf, decomprbuf, je32_to_cpu(ri->csize), je32_to_cpu(ri->dsize));
                 if (ret) {
                         printk(KERN_WARNING "Error: jffs2_decompress returned %d\n", ret);
@@ -174,7 +174,6 @@ int jffs2_read_inode_range(struct jffs2_sb_info *c, struct jffs2_inode_info *f,
                         if (frag) {
                                 D1(printk(KERN_NOTICE "Eep. Hole in ino #%u fraglist. frag->ofs = 0x%08x, offset = 0x%08x\n", f->inocache->ino, frag->ofs, offset));
                                 holesize = min(holesize, frag->ofs - offset);
-                                D2(jffs2_print_frag_list(f));
                         }
                         D1(printk(KERN_DEBUG "Filling non-frag hole from %d-%d\n", offset, offset+holesize));
                         memset(buf, 0, holesize);
@@ -192,7 +191,7 @@ int jffs2_read_inode_range(struct jffs2_sb_info *c, struct jffs2_inode_info *f,
                 } else {
                         uint32_t readlen;
                         uint32_t fragofs; /* offset within the frag to start reading */
-                        
+
                         fragofs = offset - frag->ofs;
                         readlen = min(frag->size - fragofs, end - offset);
                         D1(printk(KERN_DEBUG "Reading %d-%d from node at 0x%08x (%d)\n",