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/ufs/ialloc.c | |
| parent | a9d7bff9a84dba79609a0002e5321b74c4d64c64 (diff) | |
Merge with 2.4.0-test11.
Diffstat (limited to 'fs/ufs/ialloc.c')
| -rw-r--r-- | fs/ufs/ialloc.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/fs/ufs/ialloc.c b/fs/ufs/ialloc.c index 1a97daf7c..d7fef19cd 100644 --- a/fs/ufs/ialloc.c +++ b/fs/ufs/ialloc.c @@ -161,19 +161,16 @@ struct inode * ufs_new_inode (const struct inode * dir, int mode, int * err ) *err = -EPERM; return NULL; } - inode = get_empty_inode (); + sb = dir->i_sb; + inode = new_inode(sb); if (!inode) { *err = -ENOMEM; return NULL; } - sb = dir->i_sb; swab = sb->u.ufs_sb.s_swab; uspi = sb->u.ufs_sb.s_uspi; usb1 = ubh_get_usb_first(USPI_UBH); - inode->i_sb = sb; - inode->i_flags = 0; - lock_super (sb); *err = -ENOSPC; @@ -261,9 +258,6 @@ cg_found: sb->s_dirt = 1; inode->i_mode = mode; - inode->i_sb = sb; - inode->i_nlink = 1; - inode->i_dev = sb->s_dev; inode->i_uid = current->fsuid; if (dir->i_mode & S_ISGID) { inode->i_gid = dir->i_gid; |