diff options
| author | Linus Torvalds | 2010-05-15 09:03:15 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2010-05-15 09:03:15 -0700 |
| commit | 3f8bf8f0fd79410fbcbf9dd9910dbc9d4882c94f (patch) | |
| tree | 86792764365ca7b40a21e5eb8fc4f7b355088535 /drivers | |
| parent | c28f3f8660697d03afbdb581781b94ff6222a585 (diff) | |
| parent | 684bdc7ff95e0c1d4b0bcf236491840b55a54189 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
JFS: Free sbi memory in error path
fs/sysv: dereferencing ERR_PTR()
Fix double-free in logfs
Fix the regression created by "set S_DEAD on unlink()..." commit
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/core/inode.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/core/inode.c b/drivers/usb/core/inode.c index 4a6366a42129..111a01a747fc 100644 --- a/drivers/usb/core/inode.c +++ b/drivers/usb/core/inode.c @@ -380,6 +380,7 @@ static int usbfs_rmdir(struct inode *dir, struct dentry *dentry) mutex_lock(&inode->i_mutex); dentry_unhash(dentry); if (usbfs_empty(dentry)) { + dont_mount(dentry); drop_nlink(dentry->d_inode); drop_nlink(dentry->d_inode); dput(dentry); |