diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-11-28 03:58:46 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-11-28 03:58:46 +0000 |
| commit | b63ad0882a16a5d28003e57f2b0b81dee3fb322b (patch) | |
| tree | 0a343ce219e2b8b38a5d702d66032c57b83d9720 /fs/fat | |
| parent | a9d7bff9a84dba79609a0002e5321b74c4d64c64 (diff) | |
Merge with 2.4.0-test11.
Diffstat (limited to 'fs/fat')
| -rw-r--r-- | fs/fat/inode.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/fs/fat/inode.c b/fs/fat/inode.c index d1e8557f7..7537ee569 100644 --- a/fs/fat/inode.c +++ b/fs/fat/inode.c @@ -138,13 +138,11 @@ struct inode *fat_build_inode(struct super_block *sb, inode = fat_iget(sb, ino); if (inode) goto out; - inode = get_empty_inode(); + inode = new_inode(sb); *res = -ENOMEM; if (!inode) goto out; *res = 0; - inode->i_sb = sb; - inode->i_dev = sb->s_dev; inode->i_ino = iunique(sb, MSDOS_ROOT_INO); fat_fill_inode(inode, de); fat_attach(inode, ino); @@ -658,11 +656,9 @@ fat_read_super(struct super_block *sb, void *data, int silent, if (! sbi->nls_io) sbi->nls_io = load_nls_default(); - root_inode=get_empty_inode(); + root_inode=new_inode(sb); if (!root_inode) goto out_unload_nls; - root_inode->i_sb = sb; - root_inode->i_dev = sb->s_dev; root_inode->i_ino = MSDOS_ROOT_INO; fat_read_root(root_inode); insert_inode_hash(root_inode); @@ -798,7 +794,6 @@ static void fat_fill_inode(struct inode *inode, struct msdos_dir_entry *de) inode->i_nlink = 1; } #endif - inode->i_size = 0; if ((nr = MSDOS_I(inode)->i_start) != 0) while (nr != -1) { inode->i_size += SECTOR_SIZE*sbi->cluster_size; @@ -822,7 +817,6 @@ static void fat_fill_inode(struct inode *inode, struct msdos_dir_entry *de) (CF_LE_W(de->starthi) << 16); } MSDOS_I(inode)->i_logstart = MSDOS_I(inode)->i_start; - inode->i_nlink = 1; inode->i_size = CF_LE_L(de->size); inode->i_op = &fat_file_inode_operations; inode->i_fop = &fat_file_operations; |