+++ /dev/null
---- lustre/extN-clean/namei.c 2002-12-30 05:56:09.000000000 -0500
-+++ lustre/extN/namei.c 2002-12-30 06:29:39.000000000 -0500
-@@ -1224,7 +1224,8 @@
- if (IS_SYNC(dir))
- handle->h_sync = 1;
-
-- inode = extN_new_inode (handle, dir, mode);
-+ inode = extN_new_inode (handle, dir, mode,
-+ (unsigned long)dentry->d_fsdata);
- err = PTR_ERR(inode);
- if (!IS_ERR(inode)) {
- inode->i_op = &extN_file_inode_operations;
-@@ -1254,7 +1254,8 @@
- if (IS_SYNC(dir))
- handle->h_sync = 1;
-
-- inode = extN_new_inode (handle, dir, mode);
-+ inode = extN_new_inode (handle, dir, mode,
-+ (unsigned long)dentry->d_fsdata);
- err = PTR_ERR(inode);
- if (!IS_ERR(inode)) {
- init_special_inode(inode, mode, rdev);
-@@ -1286,7 +1286,8 @@
- if (IS_SYNC(dir))
- handle->h_sync = 1;
-
-- inode = extN_new_inode (handle, dir, S_IFDIR | mode);
-+ inode = extN_new_inode (handle, dir, S_IFDIR | mode,
-+ (unsigned long)dentry->d_fsdata);
- err = PTR_ERR(inode);
- if (IS_ERR(inode))
- goto out_stop;
-@@ -1680,7 +1681,8 @@
- if (IS_SYNC(dir))
- handle->h_sync = 1;
-
-- inode = extN_new_inode (handle, dir, S_IFLNK|S_IRWXUGO);
-+ inode = extN_new_inode (handle, dir, S_IFLNK|S_IRWXUGO,
-+ (unsigned long)dentry->d_fsdata);
- err = PTR_ERR(inode);
- if (IS_ERR(inode))
- goto out_stop;
---- lustre/extN-clean/ialloc.c 2002-12-28 23:56:42.000000000 -0500
-+++ lustre/extN/ialloc.c 2002-12-30 06:29:39.000000000 -0500
-@@ -329,8 +329,8 @@
- * For other inodes, search forward from the parent directory's block
- * group to find a free inode.
- */
--struct inode * extN_new_inode (handle_t *handle,
-- const struct inode * dir, int mode)
-+struct inode *extN_new_inode(handle_t *handle, const struct inode *dir,
-+ int mode, unsigned long goal)
- {
- struct super_block * sb;
- struct buffer_head * bh;
-@@ -360,6 +361,38 @@
-
- lock_super (sb);
- es = sbi->s_es;
-+
-+ if (goal) {
-+ i = (goal - 1) / EXTN_INODES_PER_GROUP(sb);
-+ j = (goal - 1) % EXTN_INODES_PER_GROUP(sb);
-+ gdp = extN_get_group_desc(sb, i, &bh2);
-+
-+ bitmap_nr = load_inode_bitmap (sb, i);
-+ if (bitmap_nr < 0)
-+ goto fail;
-+
-+ bh = sbi->s_inode_bitmap[bitmap_nr];
-+
-+ BUFFER_TRACE(bh, "get_write_access");
-+ err = extN_journal_get_write_access(handle, bh);
-+ if (err) goto fail;
-+
-+ if (extN_set_bit(j, bh->b_data)) {
-+ printk(KERN_ERR "goal inode %lu unavailable\n", goal);
-+ /* Oh well, we tried. */
-+ goto repeat;
-+ }
-+
-+ BUFFER_TRACE(bh, "call extN_journal_dirty_metadata");
-+ err = extN_journal_dirty_metadata(handle, bh);
-+ if (err) goto fail;
-+
-+ /* We've shortcircuited the allocation system successfully,
-+ * now finish filling in the inode.
-+ */
-+ goto have_bit_and_group;
-+ }
-+
- repeat:
- gdp = NULL;
- i = 0;
-@@ -474,6 +509,7 @@
- }
- goto repeat;
- }
-+have_bit_and_group:
- j += i * sbi->s_inodes_per_group + 1;
- if (j < sbi->s_first_ino || j > le32_to_cpu(es->s_inodes_count)) {
- extN_error (sb, "extN_new_inode",
---- lustre/extN-clean/ioctl.c 2002-12-28 23:56:42.000000000 -0500
-+++ lustre/extN/ioctl.c 2002-12-30 06:29:39.000000000 -0500
-@@ -24,6 +24,31 @@
- extN_debug ("cmd = %u, arg = %lu\n", cmd, arg);
-
- switch (cmd) {
-+ case EXTN_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);
-+ 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 EXTN_IOC_GETFLAGS:
- flags = ei->i_flags & EXTN_FL_USER_VISIBLE;
- return put_user(flags, (int *) arg);
---- lustre/include/linux/extN_fs.h~ 2002-12-30 06:01:43.000000000 -0500
-+++ lustre/include/linux/extN_fs.h 2002-12-30 06:02:51.000000000 -0500
-@@ -200,6 +200,7 @@
- #define EXTN_IOC_SETFLAGS _IOW('f', 2, long)
- #define EXTN_IOC_GETVERSION _IOR('f', 3, long)
- #define EXTN_IOC_SETVERSION _IOW('f', 4, long)
-+/* EXTN_IOC_CREATE_INUM at bottom of file (visible to kernel and user). */
- #define EXTN_IOC_GETVERSION_OLD _IOR('v', 1, long)
- #define EXTN_IOC_SETVERSION_OLD _IOW('v', 2, long)
- #ifdef CONFIG_JBD_DEBUG
-@@ -632,7 +633,8 @@
- extern int extN_sync_file (struct file *, struct dentry *, int);
-
- /* ialloc.c */
--extern struct inode * extN_new_inode (handle_t *, const struct inode *, int);
-+extern struct inode * extN_new_inode (handle_t *, const struct inode *, int,
-+ unsigned long);
- extern void extN_free_inode (handle_t *, struct inode *);
- extern struct inode * extN_orphan_get (struct super_block *, ino_t);
- extern unsigned long extN_count_free_inodes (struct super_block *);
-@@ -714,4 +716,6 @@
-
- #endif /* __KERNEL__ */
-
-+#define EXTN_IOC_CREATE_INUM _IOW('f', 5, long)
-+
- #endif /* _LINUX_EXTN_FS_H */
git://git.whamcloud.com / fs / lustre-release.git / blobdiff