Merge tag 'v3.10.107' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / fs / fat / inode.c

diff --git a/fs/fat/inode.c b/fs/fat/inode.c
index 871ea6a821dcb540f0257a329d5026d541841255..72abdad44c8904ddb8c4c814f6d76ce6b707917d 100644 (file)
--- a/fs/fat/inode.c
+++ b/fs/fat/inode.c
@@ -1230,6 +1230,16 @@ out:
        return 0;
 }
 
        return 0;
 }
 

+static void fat_dummy_inode_init(struct inode *inode)
+{
+       /* Initialize this dummy inode to work as no-op. */
+       MSDOS_I(inode)->mmu_private = 0;
+       MSDOS_I(inode)->i_start = 0;
+       MSDOS_I(inode)->i_logstart = 0;
+       MSDOS_I(inode)->i_attrs = 0;
+       MSDOS_I(inode)->i_pos = 0;
+}
+

 static int fat_read_root(struct inode *inode)
 {
        struct super_block *sb = inode->i_sb;
 static int fat_read_root(struct inode *inode)
 {
        struct super_block *sb = inode->i_sb;


@@ -1549,12 +1559,13 @@ int fat_fill_super(struct super_block *sb, void *data, int silent, int isvfat,
        fat_inode = new_inode(sb);
        if (!fat_inode)
                goto out_fail;
        fat_inode = new_inode(sb);
        if (!fat_inode)
                goto out_fail;

-       MSDOS_I(fat_inode)->i_pos = 0;
+       fat_dummy_inode_init(fat_inode);

        sbi->fat_inode = fat_inode;
 
        fsinfo_inode = new_inode(sb);
        if (!fsinfo_inode)
                goto out_fail;
        sbi->fat_inode = fat_inode;
 
        fsinfo_inode = new_inode(sb);
        if (!fsinfo_inode)
                goto out_fail;

+       fat_dummy_inode_init(fsinfo_inode);

        fsinfo_inode->i_ino = MSDOS_FSINFO_INO;
        sbi->fsinfo_inode = fsinfo_inode;
        insert_inode_hash(fsinfo_inode);
        fsinfo_inode->i_ino = MSDOS_FSINFO_INO;
        sbi->fsinfo_inode = fsinfo_inode;
        insert_inode_hash(fsinfo_inode);