Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/hfsplus

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/hfsplus:
  hfsplus: free space correcly for files unlinked while open
  hfsplus: fix double lock typo in ioctl

1 files changed, 3 insertions, 1 deletions

diff --git a/fs/hfsplus/dir.c b/fs/hfsplus/dir.c
index e318bbc0daf6..9d59c0571f59 100644
--- a/fs/hfsplus/dir.c
+++ b/fs/hfsplus/dir.c
@@ -317,8 +317,10 @@ static int hfsplus_unlink(struct inode *dir, struct dentry *dentry)
                 res = hfsplus_rename_cat(inode->i_ino,
                                          dir, &dentry->d_name,
                                          sbi->hidden_dir, &str);
-                if (!res)
+                if (!res) {
                         inode->i_flags |= S_DEAD;
+                        drop_nlink(inode);
+                }
                 goto out;
         }
         res = hfsplus_delete_cat(cnid, dir, &dentry->d_name);