iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* '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
This commit is contained in:
Linus Torvalds 2010-10-28 09:32:05 -07:00
commit 11cc21f5f5
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/hfsplus/dir.c
View File

@ -317,8 +317,10 @@ static int hfsplus_unlink(struct inode *dir, struct dentry *dentry)
res = hfsplus_rename_cat(inode->i_ino, res = hfsplus_rename_cat(inode->i_ino,
dir, &dentry->d_name, dir, &dentry->d_name,
sbi->hidden_dir, &str); sbi->hidden_dir, &str);
if (!res) if (!res) {
inode->i_flags |= S_DEAD; inode->i_flags |= S_DEAD;
drop_nlink(inode);
}
goto out; goto out;
} }
res = hfsplus_delete_cat(cnid, dir, &dentry->d_name); res = hfsplus_delete_cat(cnid, dir, &dentry->d_name);

2
fs/hfsplus/ioctl.c
View File

@ -92,7 +92,7 @@ static int hfsplus_ioctl_setflags(struct file *file, int __user *user_flags)
mark_inode_dirty(inode); mark_inode_dirty(inode);
out_unlock_inode: out_unlock_inode:
mutex_lock(&inode->i_mutex); mutex_unlock(&inode->i_mutex);
out_drop_write: out_drop_write:
mnt_drop_write(file->f_path.mnt); mnt_drop_write(file->f_path.mnt);
out: out: