2 files changed, 14 insertions, 12 deletions

diff --git a/fs/jffs/inode-v23.c b/fs/jffs/inode-v23.c
index 020cc097c539..9e46ea6da752 100644
--- a/fs/jffs/inode-v23.c
+++ b/fs/jffs/inode-v23.c
@@ -377,9 +377,9 @@ jffs_new_inode(const struct inode * dir, struct jffs_raw_inode *raw_inode,
 
 /* Get statistics of the file system.  */
 static int
-jffs_statfs(struct super_block *sb, struct kstatfs *buf)
+jffs_statfs(struct dentry *dentry, struct kstatfs *buf)
 {
-        struct jffs_control *c = (struct jffs_control *) sb->s_fs_info;
+        struct jffs_control *c = (struct jffs_control *) dentry->d_sb->s_fs_info;
         struct jffs_fmcontrol *fmc;
 
         lock_kernel();
@@ -1785,10 +1785,11 @@ static struct super_operations jffs_ops =
         .remount_fs     = jffs_remount,
 };
 
-static struct super_block *jffs_get_sb(struct file_system_type *fs_type,
-        int flags, const char *dev_name, void *data)
+static int jffs_get_sb(struct file_system_type *fs_type,
+        int flags, const char *dev_name, void *data, struct vfsmount *mnt)
 {
-        return get_sb_bdev(fs_type, flags, dev_name, data, jffs_fill_super);
+        return get_sb_bdev(fs_type, flags, dev_name, data, jffs_fill_super,
+                           mnt);
 }
 
 static struct file_system_type jffs_fs_type = {
diff --git a/fs/jffs/intrep.c b/fs/jffs/intrep.c
index 0ef207dfaf6f..5371a403130a 100644
--- a/fs/jffs/intrep.c
+++ b/fs/jffs/intrep.c
@@ -247,7 +247,7 @@ flash_safe_read(struct mtd_info *mtd, loff_t from,
         D3(printk(KERN_NOTICE "flash_safe_read(%p, %08x, %p, %08x)\n",
                   mtd, (unsigned int) from, buf, count));
 
-        res = MTD_READ(mtd, from, count, &retlen, buf);
+        res = mtd->read(mtd, from, count, &retlen, buf);
         if (retlen != count) {
                 panic("Didn't read all bytes in flash_safe_read(). Returned %d\n", res);
         }
@@ -262,7 +262,7 @@ flash_read_u32(struct mtd_info *mtd, loff_t from)
         __u32 ret;
         int res;
 
-        res = MTD_READ(mtd, from, 4, &retlen, (unsigned char *)&ret);
+        res = mtd->read(mtd, from, 4, &retlen, (unsigned char *)&ret);
         if (retlen != 4) {
                 printk("Didn't read all bytes in flash_read_u32(). Returned %d\n", res);
                 return 0;
@@ -282,7 +282,7 @@ flash_safe_write(struct mtd_info *mtd, loff_t to,
         D3(printk(KERN_NOTICE "flash_safe_write(%p, %08x, %p, %08x)\n",
                   mtd, (unsigned int) to, buf, count));
 
-        res = MTD_WRITE(mtd, to, count, &retlen, buf);
+        res = mtd->write(mtd, to, count, &retlen, buf);
         if (retlen != count) {
                 printk("Didn't write all bytes in flash_safe_write(). Returned %d\n", res);
         }
@@ -300,9 +300,9 @@ flash_safe_writev(struct mtd_info *mtd, const struct kvec *vecs,
 
         D3(printk(KERN_NOTICE "flash_safe_writev(%p, %08x, %p)\n",
                   mtd, (unsigned int) to, vecs));
-        
+
         if (mtd->writev) {
-                res = MTD_WRITEV(mtd, vecs, iovec_cnt, to, &retlen);
+                res = mtd->writev(mtd, vecs, iovec_cnt, to, &retlen);
                 return res ? res : retlen;
         }
         /* Not implemented writev. Repeatedly use write - on the not so
@@ -312,7 +312,8 @@ flash_safe_writev(struct mtd_info *mtd, const struct kvec *vecs,
         retlen=0;
 
         for (i=0; !res && i<iovec_cnt; i++) {
-                res = MTD_WRITE(mtd, to, vecs[i].iov_len, &retlen_a, vecs[i].iov_base);
+                res = mtd->write(mtd, to, vecs[i].iov_len, &retlen_a,
+                                 vecs[i].iov_base);
                 if (retlen_a != vecs[i].iov_len) {
                         printk("Didn't write all bytes in flash_safe_writev(). Returned %d\n", res);
                         if (i != iovec_cnt-1)
@@ -393,7 +394,7 @@ flash_erase_region(struct mtd_info *mtd, loff_t start,
         set_current_state(TASK_UNINTERRUPTIBLE);
         add_wait_queue(&wait_q, &wait);
 
-        if (MTD_ERASE(mtd, erase) < 0) {
+        if (mtd->erase(mtd, erase) < 0) {
                 set_current_state(TASK_RUNNING);
                 remove_wait_queue(&wait_q, &wait);
                 kfree(erase);