Add large file support changes to yaffs_vfs_single.c

Signed-off-by: Charles Manning <cdhmanning@gmail.com>

diff --git a/yaffs_vfs_multi.c b/yaffs_vfs_multi.c
index db9f7376b4d43664c6c2b17112d39451e337ef76..ce41d6c81d8150a0ad59a70fec185c2645d167c7 100644 (file)
--- a/yaffs_vfs_multi.c
+++ b/yaffs_vfs_multi.c
@@ -977,7 +977,6 @@ static int yaffs_readpage_nolock(struct file *f, struct page *pg)
        unsigned char *pg_buf;
        int ret;
        loff_t pos = ((loff_t) pg->index) << PAGE_CACHE_SHIFT;
        unsigned char *pg_buf;
        int ret;
        loff_t pos = ((loff_t) pg->index) << PAGE_CACHE_SHIFT;

-

        struct yaffs_dev *dev;
 
        yaffs_trace(YAFFS_TRACE_OS,
        struct yaffs_dev *dev;
 
        yaffs_trace(YAFFS_TRACE_OS,

diff --git a/yaffs_vfs_single.c b/yaffs_vfs_single.c
index d8379d45964aa2f8dc8a82bc0e2c83c52386bcaa..19ced5f021f7ce7e450f2dad07bf5bb9012f927a 100644 (file)
--- a/yaffs_vfs_single.c
+++ b/yaffs_vfs_single.c
@@ -1097,12 +1097,14 @@ static int yaffs_readpage_nolock(struct file *f, struct page *pg)
        unsigned char *pg_buf;
        int ret;
        struct yaffs_dev *dev;
        unsigned char *pg_buf;
        int ret;
        struct yaffs_dev *dev;

+       loff_t pos = ((loff_t) pg->index) << PAGE_CACHE_SHIFT;

 
        yaffs_trace(YAFFS_TRACE_OS,
 
        yaffs_trace(YAFFS_TRACE_OS,

-               "yaffs_readpage_nolock at %08x, size %08x",
-               (unsigned)(pg->index << PAGE_CACHE_SHIFT),
+               "yaffs_readpage_nolock at %lld, size %08x",
+               (long long)pos,

                (unsigned)PAGE_CACHE_SIZE);
 
                (unsigned)PAGE_CACHE_SIZE);
 

+

        obj = yaffs_dentry_to_obj(f->f_dentry);
 
        dev = obj->my_dev;
        obj = yaffs_dentry_to_obj(f->f_dentry);
 
        dev = obj->my_dev;


@@ -1114,8 +1116,7 @@ static int yaffs_readpage_nolock(struct file *f, struct page *pg)
 
        yaffs_gross_lock(dev);
 
 
        yaffs_gross_lock(dev);
 

-       ret = yaffs_file_rd(obj, pg_buf,
-                           pg->index << PAGE_CACHE_SHIFT, PAGE_CACHE_SIZE);
+       ret = yaffs_file_rd(obj, pg_buf, pos, PAGE_CACHE_SIZE);

 
        yaffs_gross_unlock(dev);
 
 
        yaffs_gross_unlock(dev);
 


@@ -1218,7 +1219,7 @@ static int yaffs_writepage(struct page *page, struct writeback_control *wbc)
                (int)obj->variant.file_variant.file_size, (int)inode->i_size);
 
        n_written = yaffs_wr_file(obj, buffer,
                (int)obj->variant.file_variant.file_size, (int)inode->i_size);
 
        n_written = yaffs_wr_file(obj, buffer,

-                                 page->index << PAGE_CACHE_SHIFT, n_bytes, 0);
+                                 ((loff_t)page->index) << PAGE_CACHE_SHIFT, n_bytes, 0);

 
        yaffs_touch_super(dev);
 
 
        yaffs_touch_super(dev);
 


@@ -2257,6 +2258,12 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version,
        if (!context->bg_thread)
                param->defered_dir_update = 0;
 
        if (!context->bg_thread)
                param->defered_dir_update = 0;
 

+       sb->s_maxbytes = yaffs_max_file_size(dev);
+
+       yaffs_trace(YAFFS_TRACE_OS,
+               "yaffs_readpage_nolock at %lld, size %08x",
+               (long long)pos,
+               (unsigned)PAGE_CACHE_SIZE);

        /* Release lock before yaffs_get_inode() */
        yaffs_gross_unlock(dev);
 
        /* Release lock before yaffs_get_inode() */
        yaffs_gross_unlock(dev);
 


@@ -2366,8 +2373,9 @@ static char *yaffs_dump_dev_part0(char *buf, struct yaffs_dev *dev)
 
 static char *yaffs_dump_dev_part1(char *buf, struct yaffs_dev *dev)
 {
 
 static char *yaffs_dump_dev_part1(char *buf, struct yaffs_dev *dev)
 {

-       buf +=
-           sprintf(buf, "data_bytes_per_chunk.. %d\n",
+       buf += sprintf(buf, "max file size......... %lld\n",
+                       (long long) yaffs_max_file_size(dev));
+       buf += sprintf(buf, "data_bytes_per_chunk.. %d\n",

                    dev->data_bytes_per_chunk);
        buf += sprintf(buf, "chunk_grp_bits........ %d\n", dev->chunk_grp_bits);
        buf += sprintf(buf, "chunk_grp_size........ %d\n", dev->chunk_grp_size);
                    dev->data_bytes_per_chunk);
        buf += sprintf(buf, "chunk_grp_bits........ %d\n", dev->chunk_grp_bits);
        buf += sprintf(buf, "chunk_grp_size........ %d\n", dev->chunk_grp_size);