Merge tag 'v3.10.56' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / mm / shmem.c

diff --git a/mm/shmem.c b/mm/shmem.c
index 485284d659a8cd29db420b60c9aa70775d047d25..e490ad476f01381e6b210a9130f96a62ec7409bd 100644 (file)
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -2138,8 +2138,10 @@ static int shmem_rename(struct inode *old_dir, struct dentry *old_dentry, struct
 
        if (new_dentry->d_inode) {
                (void) shmem_unlink(new_dir, new_dentry);
-               if (they_are_dirs)
+               if (they_are_dirs) {
+                       drop_nlink(new_dentry->d_inode);
                        drop_nlink(old_dir);
+               }
        } else if (they_are_dirs) {
                drop_nlink(old_dir);
                inc_nlink(new_dir);