nfsd race fixes: reiserfs
... and the same for reiserfs. The difference here is that we need insert_inode_locked4() to match iget5_locked(). Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
parent
6b38e842bb
commit
c1eaa26b67
|
@ -1753,6 +1753,7 @@ int reiserfs_new_inode(struct reiserfs_transaction_handle *th,
|
||||||
struct inode *inode)
|
struct inode *inode)
|
||||||
{
|
{
|
||||||
struct super_block *sb;
|
struct super_block *sb;
|
||||||
|
struct reiserfs_iget_args args;
|
||||||
INITIALIZE_PATH(path_to_key);
|
INITIALIZE_PATH(path_to_key);
|
||||||
struct cpu_key key;
|
struct cpu_key key;
|
||||||
struct item_head ih;
|
struct item_head ih;
|
||||||
|
@ -1780,6 +1781,14 @@ int reiserfs_new_inode(struct reiserfs_transaction_handle *th,
|
||||||
err = -ENOMEM;
|
err = -ENOMEM;
|
||||||
goto out_bad_inode;
|
goto out_bad_inode;
|
||||||
}
|
}
|
||||||
|
args.objectid = inode->i_ino = le32_to_cpu(ih.ih_key.k_objectid);
|
||||||
|
memcpy(INODE_PKEY(inode), &(ih.ih_key), KEY_SIZE);
|
||||||
|
args.dirid = le32_to_cpu(ih.ih_key.k_dir_id);
|
||||||
|
if (insert_inode_locked4(inode, args.objectid,
|
||||||
|
reiserfs_find_actor, &args) < 0) {
|
||||||
|
err = -EINVAL;
|
||||||
|
goto out_bad_inode;
|
||||||
|
}
|
||||||
if (old_format_only(sb))
|
if (old_format_only(sb))
|
||||||
/* not a perfect generation count, as object ids can be reused, but
|
/* not a perfect generation count, as object ids can be reused, but
|
||||||
** this is as good as reiserfs can do right now.
|
** this is as good as reiserfs can do right now.
|
||||||
|
@ -1859,13 +1868,9 @@ int reiserfs_new_inode(struct reiserfs_transaction_handle *th,
|
||||||
} else {
|
} else {
|
||||||
inode2sd(&sd, inode, inode->i_size);
|
inode2sd(&sd, inode, inode->i_size);
|
||||||
}
|
}
|
||||||
// these do not go to on-disk stat data
|
|
||||||
inode->i_ino = le32_to_cpu(ih.ih_key.k_objectid);
|
|
||||||
|
|
||||||
// store in in-core inode the key of stat data and version all
|
// store in in-core inode the key of stat data and version all
|
||||||
// object items will have (directory items will have old offset
|
// object items will have (directory items will have old offset
|
||||||
// format, other new objects will consist of new items)
|
// format, other new objects will consist of new items)
|
||||||
memcpy(INODE_PKEY(inode), &(ih.ih_key), KEY_SIZE);
|
|
||||||
if (old_format_only(sb) || S_ISDIR(mode) || S_ISLNK(mode))
|
if (old_format_only(sb) || S_ISDIR(mode) || S_ISLNK(mode))
|
||||||
set_inode_item_key_version(inode, KEY_FORMAT_3_5);
|
set_inode_item_key_version(inode, KEY_FORMAT_3_5);
|
||||||
else
|
else
|
||||||
|
@ -1929,7 +1934,6 @@ int reiserfs_new_inode(struct reiserfs_transaction_handle *th,
|
||||||
reiserfs_mark_inode_private(inode);
|
reiserfs_mark_inode_private(inode);
|
||||||
}
|
}
|
||||||
|
|
||||||
insert_inode_hash(inode);
|
|
||||||
reiserfs_update_sd(th, inode);
|
reiserfs_update_sd(th, inode);
|
||||||
reiserfs_check_path(&path_to_key);
|
reiserfs_check_path(&path_to_key);
|
||||||
|
|
||||||
|
@ -1956,6 +1960,7 @@ int reiserfs_new_inode(struct reiserfs_transaction_handle *th,
|
||||||
out_inserted_sd:
|
out_inserted_sd:
|
||||||
inode->i_nlink = 0;
|
inode->i_nlink = 0;
|
||||||
th->t_trans_id = 0; /* so the caller can't use this handle later */
|
th->t_trans_id = 0; /* so the caller can't use this handle later */
|
||||||
|
unlock_new_inode(inode); /* OK to do even if we hadn't locked it */
|
||||||
|
|
||||||
/* If we were inheriting an ACL, we need to release the lock so that
|
/* If we were inheriting an ACL, we need to release the lock so that
|
||||||
* iput doesn't deadlock in reiserfs_delete_xattrs. The locking
|
* iput doesn't deadlock in reiserfs_delete_xattrs. The locking
|
||||||
|
|
|
@ -646,6 +646,7 @@ static int reiserfs_create(struct inode *dir, struct dentry *dentry, int mode,
|
||||||
err = journal_end(&th, dir->i_sb, jbegin_count);
|
err = journal_end(&th, dir->i_sb, jbegin_count);
|
||||||
if (err)
|
if (err)
|
||||||
retval = err;
|
retval = err;
|
||||||
|
unlock_new_inode(inode);
|
||||||
iput(inode);
|
iput(inode);
|
||||||
goto out_failed;
|
goto out_failed;
|
||||||
}
|
}
|
||||||
|
@ -653,6 +654,7 @@ static int reiserfs_create(struct inode *dir, struct dentry *dentry, int mode,
|
||||||
reiserfs_update_inode_transaction(dir);
|
reiserfs_update_inode_transaction(dir);
|
||||||
|
|
||||||
d_instantiate(dentry, inode);
|
d_instantiate(dentry, inode);
|
||||||
|
unlock_new_inode(inode);
|
||||||
retval = journal_end(&th, dir->i_sb, jbegin_count);
|
retval = journal_end(&th, dir->i_sb, jbegin_count);
|
||||||
|
|
||||||
out_failed:
|
out_failed:
|
||||||
|
@ -727,11 +729,13 @@ static int reiserfs_mknod(struct inode *dir, struct dentry *dentry, int mode,
|
||||||
err = journal_end(&th, dir->i_sb, jbegin_count);
|
err = journal_end(&th, dir->i_sb, jbegin_count);
|
||||||
if (err)
|
if (err)
|
||||||
retval = err;
|
retval = err;
|
||||||
|
unlock_new_inode(inode);
|
||||||
iput(inode);
|
iput(inode);
|
||||||
goto out_failed;
|
goto out_failed;
|
||||||
}
|
}
|
||||||
|
|
||||||
d_instantiate(dentry, inode);
|
d_instantiate(dentry, inode);
|
||||||
|
unlock_new_inode(inode);
|
||||||
retval = journal_end(&th, dir->i_sb, jbegin_count);
|
retval = journal_end(&th, dir->i_sb, jbegin_count);
|
||||||
|
|
||||||
out_failed:
|
out_failed:
|
||||||
|
@ -812,6 +816,7 @@ static int reiserfs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
|
||||||
err = journal_end(&th, dir->i_sb, jbegin_count);
|
err = journal_end(&th, dir->i_sb, jbegin_count);
|
||||||
if (err)
|
if (err)
|
||||||
retval = err;
|
retval = err;
|
||||||
|
unlock_new_inode(inode);
|
||||||
iput(inode);
|
iput(inode);
|
||||||
goto out_failed;
|
goto out_failed;
|
||||||
}
|
}
|
||||||
|
@ -819,6 +824,7 @@ static int reiserfs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
|
||||||
reiserfs_update_sd(&th, dir);
|
reiserfs_update_sd(&th, dir);
|
||||||
|
|
||||||
d_instantiate(dentry, inode);
|
d_instantiate(dentry, inode);
|
||||||
|
unlock_new_inode(inode);
|
||||||
retval = journal_end(&th, dir->i_sb, jbegin_count);
|
retval = journal_end(&th, dir->i_sb, jbegin_count);
|
||||||
out_failed:
|
out_failed:
|
||||||
if (locked)
|
if (locked)
|
||||||
|
@ -1096,11 +1102,13 @@ static int reiserfs_symlink(struct inode *parent_dir,
|
||||||
err = journal_end(&th, parent_dir->i_sb, jbegin_count);
|
err = journal_end(&th, parent_dir->i_sb, jbegin_count);
|
||||||
if (err)
|
if (err)
|
||||||
retval = err;
|
retval = err;
|
||||||
|
unlock_new_inode(inode);
|
||||||
iput(inode);
|
iput(inode);
|
||||||
goto out_failed;
|
goto out_failed;
|
||||||
}
|
}
|
||||||
|
|
||||||
d_instantiate(dentry, inode);
|
d_instantiate(dentry, inode);
|
||||||
|
unlock_new_inode(inode);
|
||||||
retval = journal_end(&th, parent_dir->i_sb, jbegin_count);
|
retval = journal_end(&th, parent_dir->i_sb, jbegin_count);
|
||||||
out_failed:
|
out_failed:
|
||||||
reiserfs_write_unlock(parent_dir->i_sb);
|
reiserfs_write_unlock(parent_dir->i_sb);
|
||||||
|
|
Loading…
Reference in New Issue