diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-04 05:27:42 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-04 05:27:42 (GMT) |
| commit | 0a0e9ae1bd788bc19adc4d4ae08c98b233697402 (patch) | |
| tree | 13825eeb5bbeae27d66e95f12168eff4b60701ab /fs/minix/namei.c | |
| parent | 01a16b21d6adf992aa863186c3c4e561a57c1714 (diff) | |
| parent | b65a0e0c84cf489bfa00d6aa6c48abc5a237100f (diff) | |
| download | linux-0a0e9ae1bd788bc19adc4d4ae08c98b233697402.tar.xz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/bnx2x/bnx2x.h
Diffstat (limited to 'fs/minix/namei.c')
| -rw-r--r-- | fs/minix/namei.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/fs/minix/namei.c b/fs/minix/namei.c index ce7337d..6e6777f 100644 --- a/fs/minix/namei.c +++ b/fs/minix/namei.c @@ -213,7 +213,6 @@ static int minix_rename(struct inode * old_dir, struct dentry *old_dentry, new_de = minix_find_entry(new_dentry, &new_page); if (!new_de) goto out_dir; - inode_inc_link_count(old_inode); minix_set_link(new_de, new_page, old_inode); new_inode->i_ctime = CURRENT_TIME_SEC; if (dir_de) @@ -225,18 +224,15 @@ static int minix_rename(struct inode * old_dir, struct dentry *old_dentry, if (new_dir->i_nlink >= info->s_link_max) goto out_dir; } - inode_inc_link_count(old_inode); err = minix_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); } minix_delete_entry(old_de, old_page); - inode_dec_link_count(old_inode); + mark_inode_dirty(old_inode); if (dir_de) { minix_set_link(dir_de, dir_page, new_dir); |