1 files changed, 11 insertions, 10 deletions

diff --git a/fs/jffs2/fs.c b/fs/jffs2/fs.c
index d0b59d03a7a9..05fe6cf5f1ac 100644
--- a/fs/jffs2/fs.c
+++ b/fs/jffs2/fs.c
@@ -17,6 +17,7 @@
 #include <linux/sched.h>
 #include <linux/cred.h>
 #include <linux/fs.h>
+#include <linux/fs_context.h>
 #include <linux/list.h>
 #include <linux/mtd/mtd.h>
 #include <linux/pagemap.h>
@@ -184,7 +185,7 @@ int jffs2_do_setattr (struct inode *inode, struct iattr *iattr)
         if (ivalid & ATTR_SIZE && inode->i_size > iattr->ia_size) {
                 truncate_setsize(inode, iattr->ia_size);
                 inode->i_blocks = (inode->i_size + 511) >> 9;
-        }       
+        }
 
         return 0;
 }
@@ -391,7 +392,7 @@ void jffs2_dirty_inode(struct inode *inode, int flags)
         jffs2_do_setattr(inode, &iattr);
 }
 
-int jffs2_do_remount_fs(struct super_block *sb, int *flags, char *data)
+int jffs2_do_remount_fs(struct super_block *sb, struct fs_context *fc)
 {
         struct jffs2_sb_info *c = JFFS2_SB_INFO(sb);
 
@@ -409,10 +410,10 @@ int jffs2_do_remount_fs(struct super_block *sb, int *flags, char *data)
                 mutex_unlock(&c->alloc_sem);
         }
 
-        if (!(*flags & SB_RDONLY))
+        if (!(fc->sb_flags & SB_RDONLY))
                 jffs2_start_garbage_collect_thread(c);
 
-        *flags |= SB_NOATIME;
+        fc->sb_flags |= SB_NOATIME;
         return 0;
 }
 
@@ -509,7 +510,7 @@ static int calculate_inocache_hashsize(uint32_t flash_size)
         return hashsize;
 }
 
-int jffs2_do_fill_super(struct super_block *sb, void *data, int silent)
+int jffs2_do_fill_super(struct super_block *sb, struct fs_context *fc)
 {
         struct jffs2_sb_info *c;
         struct inode *root_i;
@@ -524,11 +525,11 @@ int jffs2_do_fill_super(struct super_block *sb, void *data, int silent)
 
 #ifndef CONFIG_JFFS2_FS_WRITEBUFFER
         if (c->mtd->type == MTD_NANDFLASH) {
-                pr_err("Cannot operate on NAND flash unless jffs2 NAND support is compiled in\n");
+                errorf(fc, "Cannot operate on NAND flash unless jffs2 NAND support is compiled in");
                 return -EINVAL;
         }
         if (c->mtd->type == MTD_DATAFLASH) {
-                pr_err("Cannot operate on DataFlash unless jffs2 DataFlash support is compiled in\n");
+                errorf(fc, "Cannot operate on DataFlash unless jffs2 DataFlash support is compiled in");
                 return -EINVAL;
         }
 #endif
@@ -542,12 +543,12 @@ int jffs2_do_fill_super(struct super_block *sb, void *data, int silent)
          */
         if ((c->sector_size * blocks) != c->flash_size) {
                 c->flash_size = c->sector_size * blocks;
-                pr_info("Flash size not aligned to erasesize, reducing to %dKiB\n",
-                        c->flash_size / 1024);
+                infof(fc, "Flash size not aligned to erasesize, reducing to %dKiB",
+                      c->flash_size / 1024);
         }
 
         if (c->flash_size < 5*c->sector_size) {
-                pr_err("Too few erase blocks (%d)\n",
+                errorf(fc, "Too few erase blocks (%d)",
                        c->flash_size / c->sector_size);
                 return -EINVAL;
         }