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

diff --combined fs/hfsplus/dir.c
index e318bbc,e490aaf..9d59c05
--- 1/fs/hfsplus/dir.c
--- 2/fs/hfsplus/dir.c
+++ b/fs/hfsplus/dir.c
@@@ -286,7 -286,7 +286,7 @@@ static int hfsplus_link(struct dentry *
  
        inc_nlink(inode);
        hfsplus_instantiate(dst_dentry, inode, cnid);
 -      atomic_inc(&inode->i_count);
 +      ihold(inode);
        inode->i_ctime = CURRENT_TIME_SEC;
        mark_inode_dirty(inode);
        sbi->file_count++;
@@@ -317,8 -317,10 +317,10 @@@ static int hfsplus_unlink(struct inode 
                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);