diff options
Diffstat (limited to 'fs/reiserfs/namei.c')
-rw-r--r-- | fs/reiserfs/namei.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/reiserfs/namei.c b/fs/reiserfs/namei.c index 84e8a69cee9d..8567fb847601 100644 --- a/fs/reiserfs/namei.c +++ b/fs/reiserfs/namei.c | |||
@@ -322,7 +322,7 @@ static int reiserfs_find_entry(struct inode *dir, const char *name, int namelen, | |||
322 | } | 322 | } |
323 | 323 | ||
324 | static struct dentry *reiserfs_lookup(struct inode *dir, struct dentry *dentry, | 324 | static struct dentry *reiserfs_lookup(struct inode *dir, struct dentry *dentry, |
325 | struct nameidata *nd) | 325 | unsigned int flags) |
326 | { | 326 | { |
327 | int retval; | 327 | int retval; |
328 | int lock_depth; | 328 | int lock_depth; |
@@ -573,7 +573,7 @@ static int new_inode_init(struct inode *inode, struct inode *dir, umode_t mode) | |||
573 | } | 573 | } |
574 | 574 | ||
575 | static int reiserfs_create(struct inode *dir, struct dentry *dentry, umode_t mode, | 575 | static int reiserfs_create(struct inode *dir, struct dentry *dentry, umode_t mode, |
576 | struct nameidata *nd) | 576 | bool excl) |
577 | { | 577 | { |
578 | int retval; | 578 | int retval; |
579 | struct inode *inode; | 579 | struct inode *inode; |
@@ -634,8 +634,8 @@ static int reiserfs_create(struct inode *dir, struct dentry *dentry, umode_t mod | |||
634 | reiserfs_update_inode_transaction(inode); | 634 | reiserfs_update_inode_transaction(inode); |
635 | reiserfs_update_inode_transaction(dir); | 635 | reiserfs_update_inode_transaction(dir); |
636 | 636 | ||
637 | d_instantiate(dentry, inode); | ||
638 | unlock_new_inode(inode); | 637 | unlock_new_inode(inode); |
638 | d_instantiate(dentry, inode); | ||
639 | retval = journal_end(&th, dir->i_sb, jbegin_count); | 639 | retval = journal_end(&th, dir->i_sb, jbegin_count); |
640 | 640 | ||
641 | out_failed: | 641 | out_failed: |
@@ -712,8 +712,8 @@ static int reiserfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode | |||
712 | goto out_failed; | 712 | goto out_failed; |
713 | } | 713 | } |
714 | 714 | ||
715 | d_instantiate(dentry, inode); | ||
716 | unlock_new_inode(inode); | 715 | unlock_new_inode(inode); |
716 | d_instantiate(dentry, inode); | ||
717 | retval = journal_end(&th, dir->i_sb, jbegin_count); | 717 | retval = journal_end(&th, dir->i_sb, jbegin_count); |
718 | 718 | ||
719 | out_failed: | 719 | out_failed: |
@@ -800,8 +800,8 @@ static int reiserfs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode | |||
800 | // the above add_entry did not update dir's stat data | 800 | // the above add_entry did not update dir's stat data |
801 | reiserfs_update_sd(&th, dir); | 801 | reiserfs_update_sd(&th, dir); |
802 | 802 | ||
803 | d_instantiate(dentry, inode); | ||
804 | unlock_new_inode(inode); | 803 | unlock_new_inode(inode); |
804 | d_instantiate(dentry, inode); | ||
805 | retval = journal_end(&th, dir->i_sb, jbegin_count); | 805 | retval = journal_end(&th, dir->i_sb, jbegin_count); |
806 | out_failed: | 806 | out_failed: |
807 | reiserfs_write_unlock_once(dir->i_sb, lock_depth); | 807 | reiserfs_write_unlock_once(dir->i_sb, lock_depth); |
@@ -1096,8 +1096,8 @@ static int reiserfs_symlink(struct inode *parent_dir, | |||
1096 | goto out_failed; | 1096 | goto out_failed; |
1097 | } | 1097 | } |
1098 | 1098 | ||
1099 | d_instantiate(dentry, inode); | ||
1100 | unlock_new_inode(inode); | 1099 | unlock_new_inode(inode); |
1100 | d_instantiate(dentry, inode); | ||
1101 | retval = journal_end(&th, parent_dir->i_sb, jbegin_count); | 1101 | retval = journal_end(&th, parent_dir->i_sb, jbegin_count); |
1102 | out_failed: | 1102 | out_failed: |
1103 | reiserfs_write_unlock(parent_dir->i_sb); | 1103 | reiserfs_write_unlock(parent_dir->i_sb); |