diff options
Diffstat (limited to 'fs/vfat/namei.c')
-rw-r--r-- | fs/vfat/namei.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/fs/vfat/namei.c b/fs/vfat/namei.c index 9a8f48bae956..090d74ffa061 100644 --- a/fs/vfat/namei.c +++ b/fs/vfat/namei.c | |||
@@ -782,7 +782,7 @@ static int vfat_rmdir(struct inode *dir, struct dentry *dentry) | |||
782 | err = fat_remove_entries(dir, &sinfo); /* and releases bh */ | 782 | err = fat_remove_entries(dir, &sinfo); /* and releases bh */ |
783 | if (err) | 783 | if (err) |
784 | goto out; | 784 | goto out; |
785 | dir->i_nlink--; | 785 | drop_nlink(dir); |
786 | 786 | ||
787 | inode->i_nlink = 0; | 787 | inode->i_nlink = 0; |
788 | inode->i_mtime = inode->i_atime = CURRENT_TIME_SEC; | 788 | inode->i_mtime = inode->i_atime = CURRENT_TIME_SEC; |
@@ -930,7 +930,7 @@ static int vfat_rename(struct inode *old_dir, struct dentry *old_dentry, | |||
930 | if (err) | 930 | if (err) |
931 | goto error_dotdot; | 931 | goto error_dotdot; |
932 | } | 932 | } |
933 | old_dir->i_nlink--; | 933 | drop_nlink(old_dir); |
934 | if (!new_inode) | 934 | if (!new_inode) |
935 | new_dir->i_nlink++; | 935 | new_dir->i_nlink++; |
936 | } | 936 | } |
@@ -947,10 +947,9 @@ static int vfat_rename(struct inode *old_dir, struct dentry *old_dentry, | |||
947 | mark_inode_dirty(old_dir); | 947 | mark_inode_dirty(old_dir); |
948 | 948 | ||
949 | if (new_inode) { | 949 | if (new_inode) { |
950 | drop_nlink(new_inode); | ||
950 | if (is_dir) | 951 | if (is_dir) |
951 | new_inode->i_nlink -= 2; | 952 | drop_nlink(new_inode); |
952 | else | ||
953 | new_inode->i_nlink--; | ||
954 | new_inode->i_ctime = ts; | 953 | new_inode->i_ctime = ts; |
955 | } | 954 | } |
956 | out: | 955 | out: |