Commit 4d22d666 authored by Linus Torvalds's avatar Linus Torvalds

Merge bk://linuxusb.bkbits.net/linus-2.5

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux
parents 8788833a 334d2c27
...@@ -184,6 +184,7 @@ static struct inode *usbfs_get_inode (struct super_block *sb, int mode, int dev) ...@@ -184,6 +184,7 @@ static struct inode *usbfs_get_inode (struct super_block *sb, int mode, int dev)
return inode; return inode;
} }
/* SMP-safe */
static int usbfs_mknod (struct inode *dir, struct dentry *dentry, int mode, static int usbfs_mknod (struct inode *dir, struct dentry *dentry, int mode,
int dev) int dev)
{ {
...@@ -238,7 +239,9 @@ static int usbfs_unlink (struct inode *dir, struct dentry *dentry) ...@@ -238,7 +239,9 @@ static int usbfs_unlink (struct inode *dir, struct dentry *dentry)
if (usbfs_empty(dentry)) { if (usbfs_empty(dentry)) {
struct inode *inode = dentry->d_inode; struct inode *inode = dentry->d_inode;
lock_kernel();
inode->i_nlink--; inode->i_nlink--;
unlock_kernel();
dput(dentry); dput(dentry);
error = 0; error = 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment