Revision a684e7d33096892093456dd56a582cfc3bfad648 authored by Geert Uytterhoeven on 06 November 2008, 20:53:37 UTC, committed by Linus Torvalds on 06 November 2008, 23:41:19 UTC
commit 3e680aae4e53ab54cdbb0c29257dae0cbb158e1c ("fb: convert
lock/unlock_kernel() into local fb mutex") introduced several deadlocks
in the fb_compat_ioctl() path, as mutex_lock() doesn't allow recursion,
unlike lock_kernel(). This broke frame buffer applications on 64-bit
systems with a 32-bit userland.
commit 120a37470c2831fea49fdebaceb5a7039f700ce6 ("framebuffer compat_ioctl
deadlock") fixed one of the deadlocks.
This patch fixes the remaining deadlocks:
- Revert commit 120a37470c2831fea49fdebaceb5a7039f700ce6,
- Extract the core logic of fb_ioctl() into a new function do_fb_ioctl(),
- Change all callsites of fb_ioctl() where info->lock is already held to
call do_fb_ioctl() instead,
- Add sparse annotations to all routines that take info->lock.
Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Cc: Mikulas Patocka <mpatocka@redhat.com>
Cc: Krzysztof Helt <krzysztof.h1@wp.pl>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent a70dcb9
| File | Mode | Size |
|---|---|---|
| Makefile | -rw-r--r-- | 256 bytes |
| balloc.c | -rw-r--r-- | 24.0 KB |
| dir.c | -rw-r--r-- | 5.4 KB |
| directory.c | -rw-r--r-- | 7.4 KB |
| ecma_167.h | -rw-r--r-- | 21.5 KB |
| file.c | -rw-r--r-- | 5.5 KB |
| fsync.c | -rw-r--r-- | 1.1 KB |
| ialloc.c | -rw-r--r-- | 4.1 KB |
| inode.c | -rw-r--r-- | 57.2 KB |
| lowlevel.c | -rw-r--r-- | 1.5 KB |
| misc.c | -rw-r--r-- | 7.6 KB |
| namei.c | -rw-r--r-- | 34.1 KB |
| osta_udf.h | -rw-r--r-- | 8.1 KB |
| partition.c | -rw-r--r-- | 8.3 KB |
| super.c | -rw-r--r-- | 58.4 KB |
| symlink.c | -rw-r--r-- | 2.3 KB |
| truncate.c | -rw-r--r-- | 8.7 KB |
| udf_i.h | -rw-r--r-- | 721 bytes |
| udf_sb.h | -rw-r--r-- | 3.8 KB |
| udfdecl.h | -rw-r--r-- | 7.4 KB |
| udfend.h | -rw-r--r-- | 1.4 KB |
| udftime.c | -rw-r--r-- | 5.8 KB |
| unicode.c | -rw-r--r-- | 10.7 KB |
Computing file changes ...
