git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial
[pandora-kernel.git]
/
fs
/
ext2
/
namei.c
diff --git
a/fs/ext2/namei.c
b/fs/ext2/namei.c
index
4ca8249
..
e1af5b4
100644
(file)
--- a/
fs/ext2/namei.c
+++ b/
fs/ext2/namei.c
@@
-326,7
+326,7
@@
static int ext2_rename (struct inode * old_dir, struct dentry * old_dentry,
ext2_set_link(new_dir, new_de, new_page, old_inode);
new_inode->i_ctime = CURRENT_TIME_SEC;
if (dir_de)
-
new_inode->i_nlink--
;
+
drop_nlink(new_inode)
;
inode_dec_link_count(new_inode);
} else {
if (dir_de) {