fs/ext3/ialloc.c | 35 ++++++++++++++++++++++++++++++++++- fs/ext3/ioctl.c | 25 +++++++++++++++++++++++++ fs/ext3/namei.c | 21 +++++++++++++++++---- include/linux/dcache.h | 5 +++++ include/linux/ext3_fs.h | 5 ++++- 5 files changed, 85 insertions(+), 6 deletions(-) Index: linux-2.6.10/fs/ext3/ialloc.c =================================================================== --- linux-2.6.10.orig/fs/ext3/ialloc.c 2005-03-31 18:19:50.911148112 +0800 +++ linux-2.6.10/fs/ext3/ialloc.c 2005-03-31 18:39:48.578075064 +0800 @@ -419,7 +419,8 @@ * For other inodes, search forward from the parent directory's block * group to find a free inode. */ -struct inode *ext3_new_inode(handle_t *handle, struct inode * dir, int mode) +struct inode *ext3_new_inode(handle_t *handle, struct inode * dir, int mode, + unsigned long goal) { struct super_block *sb; struct buffer_head *bitmap_bh = NULL; @@ -447,6 +448,38 @@ sbi = EXT3_SB(sb); es = sbi->s_es; + if (goal) { + group = (goal - 1) / EXT3_INODES_PER_GROUP(sb); + ino = (goal - 1) % EXT3_INODES_PER_GROUP(sb); + gdp = ext3_get_group_desc(sb, group, &bh2); + + err = -EIO; + bitmap_bh = read_inode_bitmap (sb, group); + if (!bitmap_bh) + goto fail; + + BUFFER_TRACE(bh, "get_write_access"); + err = ext3_journal_get_write_access(handle, bitmap_bh); + if (err) goto fail; + + if (ext3_set_bit_atomic(sb_bgl_lock(sbi, group), + ino, bitmap_bh->b_data)) { + printk(KERN_ERR "goal inode %lu unavailable\n", goal); + /* Oh well, we tried. */ + goto continue_allocation; + } + + BUFFER_TRACE(bh, "call ext3_journal_dirty_metadata"); + err = ext3_journal_dirty_metadata(handle, bitmap_bh); + if (err) goto fail; + + /* We've shortcircuited the allocation system successfully, + * now finish filling in the inode. + */ + goto got; + } + +continue_allocation: if (S_ISDIR(mode)) { if (test_opt (sb, OLDALLOC)) group = find_group_dir(sb, dir); Index: linux-2.6.10/fs/ext3/ioctl.c =================================================================== --- linux-2.6.10.orig/fs/ext3/ioctl.c 2004-12-25 05:34:31.000000000 +0800 +++ linux-2.6.10/fs/ext3/ioctl.c 2005-03-31 18:39:48.579074912 +0800 @@ -9,6 +9,7 @@ #include #include +#include #include #include #include @@ -25,6 +26,31 @@ ext3_debug ("cmd = %u, arg = %lu\n", cmd, arg); switch (cmd) { + case EXT3_IOC_CREATE_INUM: { + char name[32]; + struct dentry *dchild, *dparent; + int rc = 0; + + dparent = list_entry(inode->i_dentry.next, struct dentry, + d_alias); + snprintf(name, sizeof name, "%lu", arg); + dchild = lookup_one_len(name, dparent, strlen(name)); + if (dchild->d_inode) { + printk(KERN_ERR "%*s/%lu already exists (ino %lu)\n", + dparent->d_name.len, dparent->d_name.name, arg, + dchild->d_inode->i_ino); + rc = -EEXIST; + } else { + dchild->d_fsdata = (void *)arg; + rc = vfs_create(inode, dchild, 0644, NULL); + if (rc) + printk(KERN_ERR "vfs_create: %d\n", rc); + else if (dchild->d_inode->i_ino != arg) + rc = -EEXIST; + } + dput(dchild); + return rc; + } case EXT3_IOC_GETFLAGS: flags = ei->i_flags & EXT3_FL_USER_VISIBLE; return put_user(flags, (int __user *) arg); Index: linux-2.6.10/fs/ext3/namei.c =================================================================== --- linux-2.6.10.orig/fs/ext3/namei.c 2005-03-31 18:36:12.177972880 +0800 +++ linux-2.6.10/fs/ext3/namei.c 2005-03-31 18:39:48.582074456 +0800 @@ -1940,6 +1940,19 @@ return err; } +static struct inode * ext3_new_inode_wantedi(handle_t *handle, struct inode *dir, + int mode, struct dentry *dentry) +{ + unsigned long inum = 0; + + if (dentry->d_fsdata != NULL) { + struct dentry_params *param = + (struct dentry_params *) dentry->d_fsdata; + inum = param->p_inum; + } + return ext3_new_inode(handle, dir, mode, inum); +} + /* * By the time this is called, we already have created * the directory cache entry for the new file, but it @@ -1965,7 +1978,7 @@ if (IS_DIRSYNC(dir)) handle->h_sync = 1; - inode = ext3_new_inode (handle, dir, mode); + inode = ext3_new_inode_wantedi (handle, dir, mode, dentry); err = PTR_ERR(inode); if (!IS_ERR(inode)) { inode->i_op = &ext3_file_inode_operations; @@ -1999,7 +2012,7 @@ if (IS_DIRSYNC(dir)) handle->h_sync = 1; - inode = ext3_new_inode (handle, dir, mode); + inode = ext3_new_inode_wantedi (handle, dir, mode, dentry); err = PTR_ERR(inode); if (!IS_ERR(inode)) { init_special_inode(inode, inode->i_mode, rdev); @@ -2035,7 +2048,7 @@ if (IS_DIRSYNC(dir)) handle->h_sync = 1; - inode = ext3_new_inode (handle, dir, S_IFDIR | mode); + inode = ext3_new_inode_wantedi (handle, dir, S_IFDIR | mode, dentry); err = PTR_ERR(inode); if (IS_ERR(inode)) goto out_stop; @@ -2450,7 +2463,7 @@ if (IS_DIRSYNC(dir)) handle->h_sync = 1; - inode = ext3_new_inode (handle, dir, S_IFLNK|S_IRWXUGO); + inode = ext3_new_inode_wantedi (handle, dir, S_IFLNK|S_IRWXUGO, dentry); err = PTR_ERR(inode); if (IS_ERR(inode)) goto out_stop; Index: linux-2.6.10/include/linux/ext3_fs.h =================================================================== --- linux-2.6.10.orig/include/linux/ext3_fs.h 2005-03-31 18:38:11.720799608 +0800 +++ linux-2.6.10/include/linux/ext3_fs.h 2005-03-31 18:40:36.630769944 +0800 @@ -230,6 +230,7 @@ #define EXT3_IOC_SETVERSION _IOW('f', 4, long) #define EXT3_IOC_GROUP_EXTEND _IOW('f', 7, unsigned long) #define EXT3_IOC_GROUP_ADD _IOW('f', 8,struct ext3_new_group_input) +/* EXT3_IOC_CREATE_INUM at bottom of file (visible to kernel and user). */ #define EXT3_IOC_GETVERSION_OLD _IOR('v', 1, long) #define EXT3_IOC_SETVERSION_OLD _IOW('v', 2, long) #ifdef CONFIG_JBD_DEBUG @@ -742,7 +743,8 @@ dx_hash_info *hinfo); /* ialloc.c */ -extern struct inode * ext3_new_inode (handle_t *, struct inode *, int); +extern struct inode * ext3_new_inode (handle_t *, struct inode *, int, + unsigned long); extern void ext3_free_inode (handle_t *, struct inode *); extern struct inode * ext3_orphan_get (struct super_block *, unsigned long); extern unsigned long ext3_count_free_inodes (struct super_block *); @@ -834,4 +836,5 @@ #endif /* __KERNEL__ */ +#define EXT3_IOC_CREATE_INUM _IOW('f', 5, long) #endif /* _LINUX_EXT3_FS_H */