Port of sdcardfs to 4.4

[firefly-linux-kernel-4.4.55.git] / fs / sdcardfs / super.c

diff --git a/fs/sdcardfs/super.c b/fs/sdcardfs/super.c
index 1d206c82dfdf11b1ae681d1111861630d80fcba7..f153ce1b8cf398de0d57f6460901cd9ade754608 100644 (file)
--- a/fs/sdcardfs/super.c
+++ b/fs/sdcardfs/super.c
@@ -122,7 +122,7 @@ static void sdcardfs_evict_inode(struct inode *inode)
        struct inode *lower_inode;
 
        truncate_inode_pages(&inode->i_data, 0);
-       end_writeback(inode);
+       clear_inode(inode);
        /*
         * Decrement a reference to a lower_inode, which was incremented
         * by our read_inode when it was created initially.
@@ -193,9 +193,9 @@ static void sdcardfs_umount_begin(struct super_block *sb)
                lower_sb->s_op->umount_begin(lower_sb);
 }
 
-static int sdcardfs_show_options(struct seq_file *m, struct vfsmount *mnt)
+static int sdcardfs_show_options(struct seq_file *m, struct dentry *root)
 {
-       struct sdcardfs_sb_info *sbi = SDCARDFS_SB(mnt->mnt_sb);
+       struct sdcardfs_sb_info *sbi = SDCARDFS_SB(root->d_sb);
        struct sdcardfs_mount_options *opts = &sbi->options;
 
        if (opts->fs_low_uid != 0)