Merge branch 'stable-3.2' into pandora-3.2

[pandora-kernel.git] / mm / shmem.c

diff --git a/mm/shmem.c b/mm/shmem.c
index eb9b38e..1de2441 100644 (file)
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -1720,8 +1720,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 (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);
                        drop_nlink(old_dir);

+               }

        } else if (they_are_dirs) {
                drop_nlink(old_dir);
                inc_nlink(new_dir);
        } else if (they_are_dirs) {
                drop_nlink(old_dir);
                inc_nlink(new_dir);