diff options
Diffstat (limited to 'fs/msdos')
-rw-r--r-- | fs/msdos/namei.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/fs/msdos/namei.c b/fs/msdos/namei.c index d220165d4918..635613f2f65a 100644 --- a/fs/msdos/namei.c +++ b/fs/msdos/namei.c | |||
@@ -343,7 +343,7 @@ static int msdos_rmdir(struct inode *dir, struct dentry *dentry) | |||
343 | err = fat_remove_entries(dir, &sinfo); /* and releases bh */ | 343 | err = fat_remove_entries(dir, &sinfo); /* and releases bh */ |
344 | if (err) | 344 | if (err) |
345 | goto out; | 345 | goto out; |
346 | dir->i_nlink--; | 346 | drop_nlink(dir); |
347 | 347 | ||
348 | inode->i_nlink = 0; | 348 | inode->i_nlink = 0; |
349 | inode->i_ctime = CURRENT_TIME_SEC; | 349 | inode->i_ctime = CURRENT_TIME_SEC; |
@@ -549,7 +549,7 @@ static int do_msdos_rename(struct inode *old_dir, unsigned char *old_name, | |||
549 | if (err) | 549 | if (err) |
550 | goto error_dotdot; | 550 | goto error_dotdot; |
551 | } | 551 | } |
552 | old_dir->i_nlink--; | 552 | drop_nlink(old_dir); |
553 | if (!new_inode) | 553 | if (!new_inode) |
554 | new_dir->i_nlink++; | 554 | new_dir->i_nlink++; |
555 | } | 555 | } |
@@ -566,10 +566,9 @@ static int do_msdos_rename(struct inode *old_dir, unsigned char *old_name, | |||
566 | mark_inode_dirty(old_dir); | 566 | mark_inode_dirty(old_dir); |
567 | 567 | ||
568 | if (new_inode) { | 568 | if (new_inode) { |
569 | drop_nlink(new_inode); | ||
569 | if (is_dir) | 570 | if (is_dir) |
570 | new_inode->i_nlink -= 2; | 571 | drop_nlink(new_inode); |
571 | else | ||
572 | new_inode->i_nlink--; | ||
573 | new_inode->i_ctime = ts; | 572 | new_inode->i_ctime = ts; |
574 | } | 573 | } |
575 | out: | 574 | out: |