1 files changed, 9 insertions, 6 deletions

diff --git a/fs/libfs.c b/fs/libfs.c
index 7d487047dbb8..d93842d3c0a0 100644
--- a/fs/libfs.c
+++ b/fs/libfs.c
@@ -190,6 +190,10 @@ const struct inode_operations simple_dir_inode_operations = {
         .lookup         = simple_lookup,
 };
 
+static const struct super_operations simple_super_operations = {
+        .statfs         = simple_statfs,
+};
+
 /*
  * Common helper for pseudo-filesystems (sockfs, pipefs, bdev - stuff that
  * will never be mountable)
@@ -199,7 +203,6 @@ int get_sb_pseudo(struct file_system_type *fs_type, char *name,
         struct vfsmount *mnt)
 {
         struct super_block *s = sget(fs_type, NULL, set_anon_super, NULL);
-        static const struct super_operations default_ops = {.statfs = simple_statfs};
         struct dentry *dentry;
         struct inode *root;
         struct qstr d_name = {.name = name, .len = strlen(name)};
@@ -212,7 +215,7 @@ int get_sb_pseudo(struct file_system_type *fs_type, char *name,
         s->s_blocksize = 1024;
         s->s_blocksize_bits = 10;
         s->s_magic = magic;
-        s->s_op = ops ? ops : &default_ops;
+        s->s_op = ops ? ops : &simple_super_operations;
         s->s_time_gran = 1;
         root = new_inode(s);
         if (!root)
@@ -335,17 +338,18 @@ int simple_prepare_write(struct file *file, struct page *page,
                         flush_dcache_page(page);
                         kunmap_atomic(kaddr, KM_USER0);
                 }
-                SetPageUptodate(page);
         }
         return 0;
 }
 
 int simple_commit_write(struct file *file, struct page *page,
-                        unsigned offset, unsigned to)
+                        unsigned from, unsigned to)
 {
         struct inode *inode = page->mapping->host;
         loff_t pos = ((loff_t)page->index << PAGE_CACHE_SHIFT) + to;
 
+        if (!PageUptodate(page))
+                SetPageUptodate(page);
         /*
          * No need to use i_size_read() here, the i_size
          * cannot change under us because we hold the i_mutex.
@@ -358,7 +362,6 @@ int simple_commit_write(struct file *file, struct page *page,
 
 int simple_fill_super(struct super_block *s, int magic, struct tree_descr *files)
 {
-        static struct super_operations s_ops = {.statfs = simple_statfs};
         struct inode *inode;
         struct dentry *root;
         struct dentry *dentry;
@@ -367,7 +370,7 @@ int simple_fill_super(struct super_block *s, int magic, struct tree_descr *files
         s->s_blocksize = PAGE_CACHE_SIZE;
         s->s_blocksize_bits = PAGE_CACHE_SHIFT;
         s->s_magic = magic;
-        s->s_op = &s_ops;
+        s->s_op = &simple_super_operations;
         s->s_time_gran = 1;
 
         inode = new_inode(s);