https://github.com/torvalds/linux
Revision 5d914a959d251601ee8be4a1363f93e9d8ba4081 authored by Linus Torvalds on 28 October 2013, 23:57:13 UTC, committed by Linus Torvalds on 28 October 2013, 23:57:13 UTC
Pull SCSI fixes from James Bottomley:
"This is a set of four patches that revert functionality introduced in
the merge window to sg. The locking changes turned out to introduce
this bug:
[ 205.372901] [ BUG: lock held when returning to user space! ]
[...]
[ 205.373285] #0: (&sdp->o_sem){.+.+..}, at: [<ffffffff8161e650>] sg_open+0x3a0/0x4d0
The fix is large, so at this late stage we'd like to revert the
functionality and start again in the next merge window"
* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
[SCSI] Revert "sg: use rwsem to solve race during exclusive open"
[SCSI] Revert "sg: no need sg_open_exclusive_lock"
[SCSI] Revert "sg: checking sdp->detached isn't protected when open"
[SCSI] Revert "sg: push file descriptor list locking down to per-device locking"
Tip revision: 5d914a959d251601ee8be4a1363f93e9d8ba4081 authored by Linus Torvalds on 28 October 2013, 23:57:13 UTC
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Tip revision: 5d914a9
| File | Mode | Size |
|---|---|---|
| partitions | ||
| Kconfig | -rw-r--r-- | 3.6 KB |
| Kconfig.iosched | -rw-r--r-- | 1.6 KB |
| Makefile | -rw-r--r-- | 773 bytes |
| blk-cgroup.c | -rw-r--r-- | 28.8 KB |
| blk-cgroup.h | -rw-r--r-- | 16.5 KB |
| blk-core.c | -rw-r--r-- | 86.3 KB |
| blk-exec.c | -rw-r--r-- | 3.3 KB |
| blk-flush.c | -rw-r--r-- | 13.1 KB |
| blk-integrity.c | -rw-r--r-- | 11.6 KB |
| blk-ioc.c | -rw-r--r-- | 10.3 KB |
| blk-iopoll.c | -rw-r--r-- | 5.9 KB |
| blk-lib.c | -rw-r--r-- | 7.1 KB |
| blk-map.c | -rw-r--r-- | 8.2 KB |
| blk-merge.c | -rw-r--r-- | 12.7 KB |
| blk-settings.c | -rw-r--r-- | 26.3 KB |
| blk-softirq.c | -rw-r--r-- | 4.5 KB |
| blk-sysfs.c | -rw-r--r-- | 15.8 KB |
| blk-tag.c | -rw-r--r-- | 9.8 KB |
| blk-throttle.c | -rw-r--r-- | 45.8 KB |
| blk-timeout.c | -rw-r--r-- | 4.8 KB |
| blk.h | -rw-r--r-- | 7.1 KB |
| bsg-lib.c | -rw-r--r-- | 6.0 KB |
| bsg.c | -rw-r--r-- | 23.6 KB |
| cfq-iosched.c | -rw-r--r-- | 119.7 KB |
| cmdline-parser.c | -rw-r--r-- | 4.8 KB |
| compat_ioctl.c | -rw-r--r-- | 20.8 KB |
| deadline-iosched.c | -rw-r--r-- | 11.3 KB |
| elevator.c | -rw-r--r-- | 23.7 KB |
| genhd.c | -rw-r--r-- | 44.1 KB |
| ioctl.c | -rw-r--r-- | 10.7 KB |
| noop-iosched.c | -rw-r--r-- | 2.7 KB |
| partition-generic.c | -rw-r--r-- | 14.0 KB |
| scsi_ioctl.c | -rw-r--r-- | 19.6 KB |
Computing file changes ...
