summaryrefslogtreecommitdiffstats
path: root/fs/minix/namei.c
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2006-10-02 08:45:08 -0400
committerSteven Whitehouse <swhiteho@redhat.com>2006-10-02 08:45:08 -0400
commit59458f40e25915a355d8b1d701425fe9f4f9ea23 (patch)
treef1c9a2934df686e36d75f759ab7313b6f0e0e5f9 /fs/minix/namei.c
parent825f9075d74028d11d7f5932f04e1b5db3022b51 (diff)
parentd834c16516d1ebec4766fc58c059bf01311e6045 (diff)
downloadop-kernel-dev-59458f40e25915a355d8b1d701425fe9f4f9ea23.zip
op-kernel-dev-59458f40e25915a355d8b1d701425fe9f4f9ea23.tar.gz
Merge branch 'master' into gfs2
Diffstat (limited to 'fs/minix/namei.c')
-rw-r--r--fs/minix/namei.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/minix/namei.c b/fs/minix/namei.c
index 5b6a454..299bb66 100644
--- a/fs/minix/namei.c
+++ b/fs/minix/namei.c
@@ -249,7 +249,7 @@ static int minix_rename(struct inode * old_dir, struct dentry *old_dentry,
minix_set_link(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) {
OpenPOWER on IntegriCloud