Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 233814
b: refs/heads/master
c: babfe56
h: refs/heads/master
v: v3
  • Loading branch information
Al Viro committed Mar 3, 2011
1 parent 9e9afc7 commit 3abf5e5
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 30eb43d31478f0fca28423623f3ec6af13f845fa
refs/heads/master: babfe56046885749b6a90a3c4409219a1f16cf48
8 changes: 2 additions & 6 deletions trunk/fs/exofs/namei.c
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,6 @@ static int exofs_rename(struct inode *old_dir, struct dentry *old_dentry,
new_de = exofs_find_entry(new_dir, new_dentry, &new_page);
if (!new_de)
goto out_dir;
inode_inc_link_count(old_inode);
err = exofs_set_link(new_dir, new_de, new_page, old_inode);
new_inode->i_ctime = CURRENT_TIME;
if (dir_de)
Expand All @@ -286,20 +285,17 @@ static int exofs_rename(struct inode *old_dir, struct dentry *old_dentry,
if (new_dir->i_nlink >= EXOFS_LINK_MAX)
goto out_dir;
}
inode_inc_link_count(old_inode);
err = exofs_add_link(new_dentry, old_inode);
if (err) {
inode_dec_link_count(old_inode);
if (err)
goto out_dir;
}
if (dir_de)
inode_inc_link_count(new_dir);
}

old_inode->i_ctime = CURRENT_TIME;

exofs_delete_entry(old_de, old_page);
inode_dec_link_count(old_inode);
mark_inode_dirty(old_inode);

if (dir_de) {
err = exofs_set_link(old_inode, dir_de, dir_page, new_dir);
Expand Down

0 comments on commit 3abf5e5

Please sign in to comment.