6 files changed, 33 insertions, 24 deletions

diff --git a/fs/buffer.c b/fs/buffer.c
index ca12a6bb82b..4dbe52948e8 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -580,7 +580,7 @@ EXPORT_SYMBOL(mark_buffer_async_write);
 /*
  * The buffer's backing address_space's private_lock must be held
  */
-static inline void __remove_assoc_queue(struct buffer_head *bh)
+static void __remove_assoc_queue(struct buffer_head *bh)
 {
         list_del_init(&bh->b_assoc_buffers);
         WARN_ON(!bh->b_assoc_map);
diff --git a/fs/libfs.c b/fs/libfs.c
index baeb71ee1cd..1add676a19d 100644
--- a/fs/libfs.c
+++ b/fs/libfs.c
@@ -216,8 +216,8 @@ int get_sb_pseudo(struct file_system_type *fs_type, char *name,
 
         s->s_flags = MS_NOUSER;
         s->s_maxbytes = ~0ULL;
-        s->s_blocksize = 1024;
-        s->s_blocksize_bits = 10;
+        s->s_blocksize = PAGE_SIZE;
+        s->s_blocksize_bits = PAGE_SHIFT;
         s->s_magic = magic;
         s->s_op = ops ? ops : &simple_super_operations;
         s->s_time_gran = 1;
diff --git a/fs/omfs/bitmap.c b/fs/omfs/bitmap.c
index dc75f22be3f..697663b01ba 100644
--- a/fs/omfs/bitmap.c
+++ b/fs/omfs/bitmap.c
@@ -71,10 +71,10 @@ static int set_run(struct super_block *sb, int map,
                 }
                 if (set) {
                         set_bit(bit, sbi->s_imap[map]);
-                        set_bit(bit, (long *) bh->b_data);
+                        set_bit(bit, (unsigned long *)bh->b_data);
                 } else {
                         clear_bit(bit, sbi->s_imap[map]);
-                        clear_bit(bit, (long *) bh->b_data);
+                        clear_bit(bit, (unsigned long *)bh->b_data);
                 }
         }
         mark_buffer_dirty(bh);
@@ -109,7 +109,7 @@ int omfs_allocate_block(struct super_block *sb, u64 block)
                 if (!bh)
                         goto out;
 
-                set_bit(bit, (long *) bh->b_data);
+                set_bit(bit, (unsigned long *)bh->b_data);
                 mark_buffer_dirty(bh);
                 brelse(bh);
         }
diff --git a/fs/omfs/dir.c b/fs/omfs/dir.c
index 05a5bc31e4b..c0757e99887 100644
--- a/fs/omfs/dir.c
+++ b/fs/omfs/dir.c
@@ -104,7 +104,7 @@ int omfs_make_empty(struct inode *inode, struct super_block *sb)
 
         oi = (struct omfs_inode *) bh->b_data;
         oi->i_head.h_self = cpu_to_be64(inode->i_ino);
-        oi->i_sibling = ~0ULL;
+        oi->i_sibling = ~cpu_to_be64(0ULL);
 
         mark_buffer_dirty(bh);
         brelse(bh);
diff --git a/fs/omfs/file.c b/fs/omfs/file.c
index 66e01fae438..7e2499053e4 100644
--- a/fs/omfs/file.c
+++ b/fs/omfs/file.c
@@ -30,11 +30,11 @@ void omfs_make_empty_table(struct buffer_head *bh, int offset)
 {
         struct omfs_extent *oe = (struct omfs_extent *) &bh->b_data[offset];
 
-        oe->e_next = ~0ULL;
+        oe->e_next = ~cpu_to_be64(0ULL);
         oe->e_extent_count = cpu_to_be32(1),
         oe->e_fill = cpu_to_be32(0x22),
-        oe->e_entry.e_cluster = ~0ULL;
-        oe->e_entry.e_blocks = ~0ULL;
+        oe->e_entry.e_cluster = ~cpu_to_be64(0ULL);
+        oe->e_entry.e_blocks = ~cpu_to_be64(0ULL);
 }
 
 int omfs_shrink_inode(struct inode *inode)
diff --git a/fs/romfs/inode.c b/fs/romfs/inode.c
index 8e51a2aaa97..60d2f822e87 100644
--- a/fs/romfs/inode.c
+++ b/fs/romfs/inode.c
@@ -418,7 +418,8 @@ static int
 romfs_readpage(struct file *file, struct page * page)
 {
         struct inode *inode = page->mapping->host;
-        loff_t offset, avail, readlen;
+        loff_t offset, size;
+        unsigned long filled;
         void *buf;
         int result = -EIO;
 
@@ -430,21 +431,29 @@ romfs_readpage(struct file *file, struct page * page)
 
         /* 32 bit warning -- but not for us :) */
         offset = page_offset(page);
-        if (offset < i_size_read(inode)) {
-                avail = inode->i_size-offset;
-                readlen = min_t(unsigned long, avail, PAGE_SIZE);
-                if (romfs_copyfrom(inode, buf, ROMFS_I(inode)->i_dataoffset+offset, readlen) == readlen) {
-                        if (readlen < PAGE_SIZE) {
-                                memset(buf + readlen,0,PAGE_SIZE-readlen);
-                        }
-                        SetPageUptodate(page);
-                        result = 0;
+        size = i_size_read(inode);
+        filled = 0;
+        result = 0;
+        if (offset < size) {
+                unsigned long readlen;
+
+                size -= offset;
+                readlen = size > PAGE_SIZE ? PAGE_SIZE : size;
+
+                filled = romfs_copyfrom(inode, buf, ROMFS_I(inode)->i_dataoffset+offset, readlen);
+
+                if (filled != readlen) {
+                        SetPageError(page);
+                        filled = 0;
+                        result = -EIO;
                 }
         }
-        if (result) {
-                memset(buf, 0, PAGE_SIZE);
-                SetPageError(page);
-        }
+
+        if (filled < PAGE_SIZE)
+                memset(buf + filled, 0, PAGE_SIZE-filled);
+
+        if (!result)
+                SetPageUptodate(page);
         flush_dcache_page(page);
 
         unlock_page(page);