diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2011-03-04 01:18:19 -0500 |
|---|---|---|
| committer | Bob Copeland <me@bobcopeland.com> | 2011-03-05 16:23:39 -0500 |
| commit | cdb26496dba00d5c4375261be6518b3e94260444 (patch) | |
| tree | e712f23460c1632abbc02dab237eaebe924c60e1 /fs/omfs | |
| parent | 013e4f4a285d8c7d952d8d7be9f10783a85b5d3c (diff) | |
| download | linux-stable-cdb26496dba00d5c4375261be6518b3e94260444.tar.gz linux-stable-cdb26496dba00d5c4375261be6518b3e94260444.tar.bz2 linux-stable-cdb26496dba00d5c4375261be6518b3e94260444.zip | |
omfs: stop playing silly buggers with omfs_unlink() in ->rename()
Since omfs directories are hashes of inodes and name is part of
inode, we have to remove inode from old directory before we can
put it into new one / under new name. So instead of
bump i_nlink
call omfs_unlink, which does
omfs_delete_entry()
decrement i_nlink and mark parent dirty in case of success
decrement i_nlink if omfs_unlink failed and hadn't done it itself
let's just call omfs_delete_entry() and dirty the parent ourselves...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Bob Copeland <me@bobcopeland.com>
Diffstat (limited to 'fs/omfs')
| -rw-r--r-- | fs/omfs/dir.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/omfs/dir.c b/fs/omfs/dir.c index 9990fc856959..a4c2d31b785e 100644 --- a/fs/omfs/dir.c +++ b/fs/omfs/dir.c @@ -412,12 +412,11 @@ static int omfs_rename(struct inode *old_dir, struct dentry *old_dentry, /* since omfs locates files by name, we need to unlink _before_ * adding the new link or we won't find the old one */ inode_inc_link_count(old_inode); - err = omfs_unlink(old_dir, old_dentry); - if (err) { - inode_dec_link_count(old_inode); + err = omfs_delete_entry(old_dentry); + if (err) goto out; - } + mark_inode_dirty(old_dir); err = omfs_add_link(new_dentry, old_inode); if (err) goto out; |