diff options
| author | Linus Torvalds <torvalds@penguin.transmeta.com> | 2002-02-19 01:16:28 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@penguin.transmeta.com> | 2002-02-19 01:16:28 -0800 |
| commit | 4d22d666246bfb03cc1baa5ffdd22d377f5435c5 (patch) | |
| tree | b4f80fc5d76f203634a891ea8da297b9b5dc08fa | |
| parent | 8788833ad8414a49c2e68eea85364f92c46fe59e (diff) | |
| parent | 334d2c2770105d98ca344e6120589b20cb360e1b (diff) | |
Merge bk://linuxusb.bkbits.net/linus-2.5
into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux
| -rw-r--r-- | drivers/usb/inode.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/inode.c b/drivers/usb/inode.c index 09ab07b8cfa3..d3d6582957d2 100644 --- a/drivers/usb/inode.c +++ b/drivers/usb/inode.c @@ -184,6 +184,7 @@ static struct inode *usbfs_get_inode (struct super_block *sb, int mode, int dev) return inode; } +/* SMP-safe */ static int usbfs_mknod (struct inode *dir, struct dentry *dentry, int mode, int dev) { @@ -238,7 +239,9 @@ static int usbfs_unlink (struct inode *dir, struct dentry *dentry) if (usbfs_empty(dentry)) { struct inode *inode = dentry->d_inode; + lock_kernel(); inode->i_nlink--; + unlock_kernel(); dput(dentry); error = 0; } |