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-- | 149 bytes |
fid.c | -rw-r--r-- | 4.6 KB |
fid.h | -rw-r--r-- | 1.7 KB |
v9fs.c | -rw-r--r-- | 7.1 KB |
v9fs.h | -rw-r--r-- | 4.0 KB |
v9fs_vfs.h | -rw-r--r-- | 2.3 KB |
vfs_addr.c | -rw-r--r-- | 1.9 KB |
vfs_dentry.c | -rw-r--r-- | 2.8 KB |
vfs_dir.c | -rw-r--r-- | 3.3 KB |
vfs_file.c | -rw-r--r-- | 6.2 KB |
vfs_inode.c | -rw-r--r-- | 25.3 KB |
vfs_super.c | -rw-r--r-- | 5.3 KB |
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...