BKL removal follow-up
Subsystems (53)
Arnd Bergmann
maintainercover BKL removal follow-up
Hi Linus,
It seems the v4l and udf code has been worked out now and patches to kill the BKL there are finally making it upstream.
As promised, here are the patches I did since the kernel summit to turn off the BKL by default. Given that -rc2 is out now, I don't know how much of these you still want for 2.6.37, so just pick the ones you like and I'll send a pull request for the rest once the 2.6.38 merge window opens.
The patches have been in -next for three days, and I fixed up the two problems that this has revealed. I would have liked to give them more testing and wait until you have pulled the UDF patches, but I'm planning to be offline until next Wednesday.
Arnd
Arnd Bergmann (7):
staging/stradis: mark as "depends on BKL" drm/i810: remove the BKL
BKL: remove extraneous #include <smp_lock.h>
BKL: remove references to lock_kernel from comments
BKL: disable by default
BKL: mark lock_kernel as deprecated
BKL: move CONFIG_BKL to staging
arch/blackfin/kernel/process.c | 1 - arch/frv/kernel/process.c | 1 - arch/h8300/kernel/process.c | 1 - arch/m68k/kernel/process.c | 1 - arch/m68knommu/kernel/process.c | 1 - arch/mn10300/kernel/process.c | 1 - arch/parisc/hpux/sys_hpux.c | 1 - arch/parisc/kernel/sys_parisc32.c | 1 - arch/powerpc/kernel/sys_ppc32.c | 1 - arch/s390/kernel/compat_linux.c | 1 - arch/sparc/kernel/leon_smp.c | 1 - arch/sparc/kernel/sys_sparc32.c | 1 - arch/sparc/kernel/sys_sparc_32.c | 1 - arch/sparc/kernel/unaligned_32.c | 1 - arch/sparc/kernel/windows.c | 1 - arch/tile/kernel/compat.c | 1 - arch/tile/kernel/compat_signal.c | 1 - arch/tile/kernel/signal.c | 1 - arch/tile/kernel/smpboot.c | 1 - arch/tile/kernel/sys.c | 1 - arch/tile/mm/fault.c | 1 - arch/tile/mm/hugetlbpage.c | 1 - arch/um/kernel/exec.c | 1 - arch/x86/ia32/sys_ia32.c | 1 - arch/x86/kernel/cpuid.c | 1 - arch/x86/kernel/msr.c | 1 - block/compat_ioctl.c | 1 - block/ioctl.c | 1 - drivers/block/drbd/drbd_receiver.c | 1 - drivers/block/drbd/drbd_worker.c | 1 - drivers/char/agp/frontend.c | 1 - drivers/char/amiserial.c | 1 - drivers/char/briq_panel.c | 1 - drivers/char/hpet.c | 1 - drivers/char/hw_random/core.c | 1 - drivers/char/istallion.c | 1 - drivers/char/serial167.c | 1 - drivers/char/specialix.c | 1 - drivers/char/stallion.c | 1 - drivers/char/sx.c | 1 - drivers/char/uv_mmtimer.c | 1 - drivers/gpu/drm/Kconfig | 4 ++-- drivers/gpu/drm/drm_fops.c | 1 - drivers/gpu/drm/i810/i810_dma.c | 18 +----------------- drivers/gpu/drm/i810/i810_drv.c | 6 +++++- drivers/hid/hidraw.c | 1 - drivers/hid/usbhid/hiddev.c | 1 - drivers/infiniband/hw/ipath/ipath_file_ops.c | 1 - drivers/input/input.c | 1 - drivers/input/serio/serio_raw.c | 1 - drivers/media/dvb/dvb-core/dvb_ca_en50221.c | 1 - drivers/media/dvb/dvb-core/dvb_frontend.c | 1 - drivers/media/dvb/ngene/ngene-core.c | 1 - drivers/media/dvb/ngene/ngene-dvb.c | 1 - drivers/media/dvb/ngene/ngene-i2c.c | 1 - drivers/media/radio/radio-mr800.c | 1 - drivers/media/radio/si470x/radio-si470x.h | 1 - drivers/media/video/bt8xx/bttv-driver.c | 1 - drivers/media/video/cx88/cx88-blackbird.c | 1 - drivers/media/video/cx88/cx88-video.c | 1 - drivers/media/video/pwc/pwc-if.c | 1 - drivers/media/video/s2255drv.c | 1 - drivers/media/video/saa7134/saa7134-empress.c | 1 - drivers/media/video/saa7164/saa7164.h | 1 - drivers/media/video/usbvision/usbvision-video.c | 1 - drivers/media/video/v4l2-compat-ioctl32.c | 1 - drivers/net/wireless/orinoco/orinoco_usb.c | 1 - drivers/parisc/eisa_eeprom.c | 1 - drivers/pci/proc.c | 1 - drivers/pnp/isapnp/proc.c | 1 - drivers/s390/block/dasd_eer.c | 1 - drivers/s390/char/fs3270.c | 1 - drivers/s390/char/tape_char.c | 1 - drivers/s390/char/vmlogrdr.c | 1 - drivers/s390/char/vmur.c | 1 - drivers/s390/crypto/zcrypt_api.c | 1 - drivers/scsi/hpsa.c | 1 - drivers/scsi/pm8001/pm8001_sas.h | 1 - drivers/scsi/sd.c | 1 - drivers/serial/crisv10.c | 1 - drivers/serial/serial_core.c | 1 - drivers/staging/Kconfig | 11 +++++++++++ drivers/staging/cx25821/cx25821.h | 1 - drivers/staging/easycap/easycap.h | 1 - .../staging/intel_sst/intel_sst_app_interface.c | 1 - drivers/staging/rtl8712/osdep_service.h | 1 - drivers/staging/speakup/buffers.c | 1 - drivers/staging/stradis/Kconfig | 2 +- drivers/usb/core/devices.c | 1 - drivers/usb/core/devio.c | 1 - drivers/usb/core/file.c | 1 - drivers/usb/core/inode.c | 1 - drivers/usb/gadget/f_fs.c | 1 - drivers/usb/gadget/f_hid.c | 1 - drivers/usb/host/isp1362-hcd.c | 1 - drivers/usb/host/uhci-debug.c | 1 - drivers/usb/mon/mon_bin.c | 1 - drivers/usb/mon/mon_stat.c | 1 - drivers/usb/serial/usb-serial.c | 1 - drivers/video/console/vgacon.c | 1 - drivers/xen/xenfs/privcmd.c | 1 - drivers/zorro/proc.c | 1 - fs/block_dev.c | 1 - fs/ceph/inode.c | 1 - fs/ceph/mds_client.c | 1 - fs/compat_ioctl.c | 1 - fs/ecryptfs/super.c | 1 - fs/ext3/super.c | 1 - fs/ioctl.c | 1 - fs/lockd/clntlock.c | 1 - fs/lockd/clntproc.c | 1 - fs/lockd/svc4proc.c | 1 - fs/lockd/svclock.c | 1 - fs/lockd/svcproc.c | 1 - fs/locks.c | 1 - fs/namespace.c | 1 - fs/ncpfs/dir.c | 1 - fs/ncpfs/file.c | 1 - fs/ncpfs/inode.c | 1 - fs/ncpfs/ioctl.c | 1 - fs/nfs/callback.c | 1 - fs/nfs/delegation.c | 1 - fs/nfs/super.c | 1 - fs/nfsd/nfs4state.c | 8 ++++---- fs/ocfs2/super.c | 1 - fs/proc/inode.c | 1 - fs/read_write.c | 1 - fs/reiserfs/inode.c | 1 - fs/reiserfs/ioctl.c | 1 - fs/reiserfs/journal.c | 1 - fs/reiserfs/super.c | 1 - include/linux/hardirq.h | 1 - include/linux/reiserfs_fs.h | 1 - include/linux/smp_lock.h | 15 ++------------- include/linux/tty.h | 1 - init/main.c | 1 - kernel/trace/trace.c | 1 - lib/Kconfig.debug | 9 --------- net/irda/af_irda.c | 1 - net/irda/irnet/irnet_ppp.c | 1 - net/sunrpc/svc_xprt.c | 1 - sound/core/info.c | 1 - sound/core/pcm_native.c | 1 - sound/core/sound.c | 1 - sound/sound_core.c | 1 - 145 files changed, 26 insertions(+), 184 deletions(-)
Cc: Nathan Laredo <laredo-mXXj517/[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
Cc: Dave Airlie <[email protected]>
Cc: [email protected]
Cc: "J. Bruce Fields" <[email protected]>
Cc: [email protected]
Cc: Alessio Igor Bogani <[email protected]>
Cc: Jan Kara <[email protected]>
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Arnd Bergmann
maintainerPATCH 1/7 staging/stradis: mark as "depends on BKL"
The stradis driver is on its way out, but it should still be marked correctly as depending on the big kernel lock. It could easily be changed to not require it if someone decides to revive the driver and port it to v4l2 in the process.
--- drivers/staging/stradis/Kconfig | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/staging/stradis/Kconfig +1 -1
@@ -1,6 +1,6 @@ config VIDEO_STRADIS tristate "Stradis 4:2:2 MPEG-2 video driver (DEPRECATED)" - depends on EXPERIMENTAL && PCI && VIDEO_V4L1 && VIRT_TO_BUS + depends on EXPERIMENTAL && PCI && VIDEO_V4L1 && VIRT_TO_BUS && BKL help Say Y here to enable support for the Stradis 4:2:2 MPEG-2 video driver for PCI. There is a product page at
Signature · 1 line
1.7.1
Re: [PATCH 1/7] staging/stradis: mark as "depends on BKL"
Quoted 11 lines · Arnd Bergmann
The stradis driver is on its way out, but it should still be marked correctly as depending on the big kernel lock. It could easily be changed to not require it if someone decides to revive the driver and port it to v4l2 in the process.
Signed-off-by Arnd Bergmann <[email protected]>Reported-by Sedat Dilek <[email protected]>Cc Nathan Laredo <[email protected]>Cc Greg Kroah-Hartman <[email protected]>
Arnd Bergmann
maintainerPATCH 2/7 drm/i810: remove the BKL
In reply to Arnd BergmannSMP i810 systems were practically nonexistent and the configuration was not officially supported by Intel at the time when Pentium-III was common.
With this change, it is still possible to build a distribution kernel that has support for SMP and includes the i810 driver without the BKL. As a precaution, check for the theoretical SMP case at run time and refuse to load the driver.
We also need to disable CONFIG_PREEMPT builds for this driver.
--- drivers/gpu/drm/Kconfig | 4 ++-- drivers/gpu/drm/i810/i810_dma.c | 18 +----------------- drivers/gpu/drm/i810/i810_drv.c | 6 +++++- 3 files changed, 8 insertions(+), 20 deletions(-)
drivers/gpu/drm/Kconfig +2 -2
@@ -73,8 +73,8 @@ source "drivers/gpu/drm/radeon/Kconfig" config DRM_I810 tristate "Intel I810" - # BKL usage in order to avoid AB-BA deadlocks, may become BROKEN_ON_SMP - depends on DRM && AGP && AGP_INTEL && BKL + # !PREEMPT because of missing ioctl locking + depends on DRM && AGP && AGP_INTEL && (!PREEMPT || BROKEN) help Choose this option if you have an Intel I810 graphics card. If M is selected, the module will be called i810. AGP support is required
drivers/gpu/drm/i810/i810_dma.c +1 -17
@@ -37,7 +37,6 @@#include <linux/interrupt.h> /* For task queue support */ #include <linux/delay.h> #include <linux/slab.h> -#include <linux/smp_lock.h> #include <linux/pagemap.h> #define I810_BUF_FREE 2
@@ -94,7 +93,6 @@ static int i810_mmap_buffers(struct file *filp, struct vm_area_struct *vma)struct drm_buf *buf;drm_i810_buf_priv_t *buf_priv; -lock_kernel (); dev = priv->minor->dev; dev_priv = dev->dev_private; buf = dev_priv->mmap_buffer;
@@ -104,7 +102,6 @@ static int i810_mmap_buffers(struct file *filp, struct vm_area_struct *vma) vma->vm_file = filp; buf_priv->currently_mapped =I810_BUF_MAPPED ; -unlock_kernel (); if (io_remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff,
@@ -116,7 +113,7 @@ static int i810_mmap_buffers(struct file *filp, struct vm_area_struct *vma)static const struct file_operations i810_buffer_fops = { .open = drm_open, .release = drm_release, - .unlocked_ioctl = i810_ioctl, + .unlocked_ioctl = drm_ioctl, .mmap = i810_mmap_buffers, .fasync = drm_fasync, .llseek = noop_llseek,
@@ -1242,19 +1239,6 @@ int i810_driver_dma_quiescent(struct drm_device *dev)return 0 ; } -/* -* call the drm_ioctl under the big kernel lock because -* to lock against the i810_mmap_buffers function. -*/ -long i810_ioctl (struct file *file,unsigned int cmd,unsigned long arg) -{ -int ret; -lock_kernel (); - ret =drm_ioctl (file, cmd, arg); -unlock_kernel (); -return ret; -} -struct drm_ioctl_desc i810_ioctls[] = {DRM_IOCTL_DEF_DRV (I810_INIT , i810_dma_init,DRM_AUTH |DRM_MASTER |DRM_ROOT_ONLY |DRM_UNLOCKED ),DRM_IOCTL_DEF_DRV (I810_VERTEX , i810_dma_vertex,DRM_AUTH |DRM_UNLOCKED ),
drivers/gpu/drm/i810/i810_drv.c +5 -1
@@ -57,7 +57,7 @@ static struct drm_driver driver = { .owner = THIS_MODULE, .open = drm_open, .release = drm_release, - .unlocked_ioctl = i810_ioctl, + .unlocked_ioctl = drm_ioctl, .mmap = drm_mmap, .poll = drm_poll, .fasync = drm_fasync,
@@ -79,6 +79,10 @@ static struct drm_driver driver = {static int __init i810_init (void ) { +if (num_possible_cpus () >1 ) { +pr_err ("drm/i810 does not support SMP\n" ); +return -EINVAL ; + } driver.num_ioctls = i810_max_ioctl;return drm_init (&driver); }
Signature · 1 line
1.7.1
Arnd Bergmann
maintainerPATCH 3/7 BKL: remove extraneous #include <smp_lock.h>
In reply to Arnd BergmannThe big kernel lock has been removed from all these files at some point, leaving only the #include. Remove this too as a cleanup.
--- arch/blackfin/kernel/process.c | 1 - arch/frv/kernel/process.c | 1 - arch/h8300/kernel/process.c | 1 - arch/m68k/kernel/process.c | 1 - arch/m68knommu/kernel/process.c | 1 - arch/mn10300/kernel/process.c | 1 - arch/parisc/hpux/sys_hpux.c | 1 - arch/parisc/kernel/sys_parisc32.c | 1 - arch/powerpc/kernel/sys_ppc32.c | 1 - arch/s390/kernel/compat_linux.c | 1 - arch/sparc/kernel/leon_smp.c | 1 - arch/sparc/kernel/sys_sparc32.c | 1 - arch/sparc/kernel/sys_sparc_32.c | 1 - arch/sparc/kernel/unaligned_32.c | 1 - arch/sparc/kernel/windows.c | 1 - arch/tile/kernel/compat.c | 1 - arch/tile/kernel/compat_signal.c | 1 - arch/tile/kernel/signal.c | 1 - arch/tile/kernel/smpboot.c | 1 - arch/tile/kernel/sys.c | 1 - arch/tile/mm/fault.c | 1 - arch/tile/mm/hugetlbpage.c | 1 - arch/um/kernel/exec.c | 1 - arch/x86/ia32/sys_ia32.c | 1 - arch/x86/kernel/cpuid.c | 1 - arch/x86/kernel/msr.c | 1 - block/compat_ioctl.c | 1 - block/ioctl.c | 1 - drivers/block/drbd/drbd_receiver.c | 1 - drivers/block/drbd/drbd_worker.c | 1 - drivers/char/agp/frontend.c | 1 - drivers/char/amiserial.c | 1 - drivers/char/briq_panel.c | 1 - drivers/char/hpet.c | 1 - drivers/char/hw_random/core.c | 1 - drivers/char/istallion.c | 1 - drivers/char/serial167.c | 1 - drivers/char/specialix.c | 1 - drivers/char/stallion.c | 1 - drivers/char/sx.c | 1 - drivers/char/uv_mmtimer.c | 1 - drivers/gpu/drm/drm_fops.c | 1 - drivers/hid/hidraw.c | 1 - drivers/hid/usbhid/hiddev.c | 1 - drivers/infiniband/hw/ipath/ipath_file_ops.c | 1 - drivers/input/input.c | 1 - drivers/input/serio/serio_raw.c | 1 - drivers/media/dvb/dvb-core/dvb_ca_en50221.c | 1 - drivers/media/dvb/dvb-core/dvb_frontend.c | 1 - drivers/media/dvb/ngene/ngene-core.c | 1 - drivers/media/dvb/ngene/ngene-dvb.c | 1 - drivers/media/dvb/ngene/ngene-i2c.c | 1 - drivers/media/radio/radio-mr800.c | 1 - drivers/media/radio/si470x/radio-si470x.h | 1 - drivers/media/video/bt8xx/bttv-driver.c | 1 - drivers/media/video/cx88/cx88-blackbird.c | 1 - drivers/media/video/cx88/cx88-video.c | 1 - drivers/media/video/pwc/pwc-if.c | 1 - drivers/media/video/s2255drv.c | 1 - drivers/media/video/saa7134/saa7134-empress.c | 1 - drivers/media/video/saa7164/saa7164.h | 1 - drivers/media/video/usbvision/usbvision-video.c | 1 - drivers/media/video/v4l2-compat-ioctl32.c | 1 - drivers/net/wireless/orinoco/orinoco_usb.c | 1 - drivers/parisc/eisa_eeprom.c | 1 - drivers/pci/proc.c | 1 - drivers/pnp/isapnp/proc.c | 1 - drivers/s390/block/dasd_eer.c | 1 - drivers/s390/char/fs3270.c | 1 - drivers/s390/char/tape_char.c | 1 - drivers/s390/char/vmlogrdr.c | 1 - drivers/s390/char/vmur.c | 1 - drivers/s390/crypto/zcrypt_api.c | 1 - drivers/scsi/hpsa.c | 1 - drivers/scsi/pm8001/pm8001_sas.h | 1 - drivers/scsi/sd.c | 1 - drivers/serial/crisv10.c | 1 - drivers/serial/serial_core.c | 1 - drivers/staging/cx25821/cx25821.h | 1 - drivers/staging/easycap/easycap.h | 1 - .../staging/intel_sst/intel_sst_app_interface.c | 1 - drivers/staging/rtl8712/osdep_service.h | 1 - drivers/staging/speakup/buffers.c | 1 - drivers/usb/core/devices.c | 1 - drivers/usb/core/devio.c | 1 - drivers/usb/core/file.c | 1 - drivers/usb/core/inode.c | 1 - drivers/usb/gadget/f_fs.c | 1 - drivers/usb/gadget/f_hid.c | 1 - drivers/usb/host/isp1362-hcd.c | 1 - drivers/usb/host/uhci-debug.c | 1 - drivers/usb/mon/mon_bin.c | 1 - drivers/usb/mon/mon_stat.c | 1 - drivers/usb/serial/usb-serial.c | 1 - drivers/video/console/vgacon.c | 1 - drivers/xen/xenfs/privcmd.c | 1 - drivers/zorro/proc.c | 1 - fs/block_dev.c | 1 - fs/ceph/inode.c | 1 - fs/ceph/mds_client.c | 1 - fs/compat_ioctl.c | 1 - fs/ecryptfs/super.c | 1 - fs/ext3/super.c | 1 - fs/ioctl.c | 1 - fs/lockd/clntlock.c | 1 - fs/lockd/clntproc.c | 1 - fs/lockd/svc4proc.c | 1 - fs/lockd/svclock.c | 1 - fs/lockd/svcproc.c | 1 - fs/locks.c | 1 - fs/namespace.c | 1 - fs/ncpfs/dir.c | 1 - fs/ncpfs/file.c | 1 - fs/ncpfs/inode.c | 1 - fs/ncpfs/ioctl.c | 1 - fs/nfs/callback.c | 1 - fs/nfs/delegation.c | 1 - fs/nfs/super.c | 1 - fs/ocfs2/super.c | 1 - fs/proc/inode.c | 1 - fs/read_write.c | 1 - fs/reiserfs/inode.c | 1 - fs/reiserfs/ioctl.c | 1 - fs/reiserfs/journal.c | 1 - fs/reiserfs/super.c | 1 - include/linux/hardirq.h | 1 - include/linux/reiserfs_fs.h | 1 - include/linux/tty.h | 1 - init/main.c | 1 - kernel/trace/trace.c | 1 - net/irda/af_irda.c | 1 - net/irda/irnet/irnet_ppp.c | 1 - net/sunrpc/svc_xprt.c | 1 - sound/core/info.c | 1 - sound/core/pcm_native.c | 1 - sound/core/sound.c | 1 - sound/sound_core.c | 1 - 137 files changed, 0 insertions(+), 137 deletions(-)
arch/blackfin/kernel/process.c +0 -1
@@ -7,7 +7,6 @@*/ #include <linux/module.h> -#include <linux/smp_lock.h> #include <linux/unistd.h> #include <linux/user.h> #include <linux/uaccess.h>
arch/frv/kernel/process.c +0 -1
@@ -16,7 +16,6 @@#include <linux/kernel.h> #include <linux/mm.h> #include <linux/smp.h> -#include <linux/smp_lock.h> #include <linux/stddef.h> #include <linux/unistd.h> #include <linux/ptrace.h>
arch/h8300/kernel/process.c +0 -1
@@ -28,7 +28,6 @@#include <linux/kernel.h> #include <linux/mm.h> #include <linux/smp.h> -#include <linux/smp_lock.h> #include <linux/stddef.h> #include <linux/unistd.h> #include <linux/ptrace.h>
arch/m68k/kernel/process.c +0 -1
@@ -18,7 +18,6 @@#include <linux/slab.h> #include <linux/fs.h> #include <linux/smp.h> -#include <linux/smp_lock.h> #include <linux/stddef.h> #include <linux/unistd.h> #include <linux/ptrace.h>
arch/m68knommu/kernel/process.c +0 -1
@@ -19,7 +19,6 @@#include <linux/kernel.h> #include <linux/mm.h> #include <linux/smp.h> -#include <linux/smp_lock.h> #include <linux/stddef.h> #include <linux/unistd.h> #include <linux/ptrace.h>
arch/mn10300/kernel/process.c +0 -1
@@ -14,7 +14,6 @@#include <linux/kernel.h> #include <linux/mm.h> #include <linux/smp.h> -#include <linux/smp_lock.h> #include <linux/stddef.h> #include <linux/unistd.h> #include <linux/ptrace.h>
arch/parisc/hpux/sys_hpux.c +0 -1
@@ -28,7 +28,6 @@#include <linux/namei.h> #include <linux/sched.h> #include <linux/slab.h> -#include <linux/smp_lock.h> #include <linux/syscalls.h> #include <linux/utsname.h> #include <linux/vfs.h>
arch/parisc/kernel/sys_parisc32.c +0 -1
@@ -20,7 +20,6 @@#include <linux/times.h> #include <linux/time.h> #include <linux/smp.h> -#include <linux/smp_lock.h> #include <linux/sem.h> #include <linux/msg.h> #include <linux/shm.h>
arch/powerpc/kernel/sys_ppc32.c +0 -1
@@ -23,7 +23,6 @@#include <linux/resource.h> #include <linux/times.h> #include <linux/smp.h> -#include <linux/smp_lock.h> #include <linux/sem.h> #include <linux/msg.h> #include <linux/shm.h>
arch/s390/kernel/compat_linux.c +0 -1
@@ -25,7 +25,6 @@#include <linux/resource.h> #include <linux/times.h> #include <linux/smp.h> -#include <linux/smp_lock.h> #include <linux/sem.h> #include <linux/msg.h> #include <linux/shm.h>
arch/sparc/kernel/leon_smp.c +0 -1
@@ -12,7 +12,6 @@#include <linux/sched.h> #include <linux/threads.h> #include <linux/smp.h> -#include <linux/smp_lock.h> #include <linux/interrupt.h> #include <linux/kernel_stat.h> #include <linux/init.h>
arch/sparc/kernel/sys_sparc32.c +0 -1
@@ -17,7 +17,6 @@#include <linux/resource.h> #include <linux/times.h> #include <linux/smp.h> -#include <linux/smp_lock.h> #include <linux/sem.h> #include <linux/msg.h> #include <linux/shm.h>
arch/sparc/kernel/sys_sparc_32.c +0 -1
@@ -19,7 +19,6 @@#include <linux/mman.h> #include <linux/utsname.h> #include <linux/smp.h> -#include <linux/smp_lock.h> #include <linux/ipc.h> #include <asm/uaccess.h>
arch/sparc/kernel/unaligned_32.c +0 -1
@@ -16,7 +16,6 @@#include <asm/system.h> #include <asm/uaccess.h> #include <linux/smp.h> -#include <linux/smp_lock.h> #include <linux/perf_event.h> enum direction {
arch/sparc/kernel/windows.c +0 -1
@@ -9,7 +9,6 @@#include <linux/string.h> #include <linux/mm.h> #include <linux/smp.h> -#include <linux/smp_lock.h> #include <asm/uaccess.h>
arch/tile/kernel/compat.c +0 -1
@@ -21,7 +21,6 @@#include <linux/kdev_t.h> #include <linux/fs.h> #include <linux/fcntl.h> -#include <linux/smp_lock.h> #include <linux/uaccess.h> #include <linux/signal.h> #include <asm/syscalls.h>
arch/tile/kernel/compat_signal.c +0 -1
@@ -15,7 +15,6 @@#include <linux/sched.h> #include <linux/mm.h> #include <linux/smp.h> -#include <linux/smp_lock.h> #include <linux/kernel.h> #include <linux/signal.h> #include <linux/errno.h>
arch/tile/kernel/signal.c +0 -1
@@ -16,7 +16,6 @@#include <linux/sched.h> #include <linux/mm.h> #include <linux/smp.h> -#include <linux/smp_lock.h> #include <linux/kernel.h> #include <linux/signal.h> #include <linux/errno.h>
arch/tile/kernel/smpboot.c +0 -1
@@ -18,7 +18,6 @@#include <linux/mm.h> #include <linux/sched.h> #include <linux/kernel_stat.h> -#include <linux/smp_lock.h> #include <linux/bootmem.h> #include <linux/notifier.h> #include <linux/cpu.h>
arch/tile/kernel/sys.c +0 -1
@@ -20,7 +20,6 @@#include <linux/sched.h> #include <linux/mm.h> #include <linux/smp.h> -#include <linux/smp_lock.h> #include <linux/syscalls.h> #include <linux/mman.h> #include <linux/file.h>
arch/tile/mm/fault.c +0 -1
@@ -24,7 +24,6 @@#include <linux/mman.h> #include <linux/mm.h> #include <linux/smp.h> -#include <linux/smp_lock.h> #include <linux/interrupt.h> #include <linux/init.h> #include <linux/tty.h>
arch/tile/mm/hugetlbpage.c +0 -1
@@ -21,7 +21,6 @@#include <linux/mm.h> #include <linux/hugetlb.h> #include <linux/pagemap.h> -#include <linux/smp_lock.h> #include <linux/slab.h> #include <linux/err.h> #include <linux/sysctl.h>
arch/um/kernel/exec.c +0 -1
@@ -5,7 +5,6 @@#include "linux/stddef.h" #include "linux/fs.h" -#include "linux/smp_lock.h" #include "linux/ptrace.h" #include "linux/sched.h" #include "linux/slab.h"
arch/x86/ia32/sys_ia32.c +0 -1
@@ -28,7 +28,6 @@#include <linux/syscalls.h> #include <linux/times.h> #include <linux/utsname.h> -#include <linux/smp_lock.h> #include <linux/mm.h> #include <linux/uio.h> #include <linux/poll.h>
arch/x86/kernel/cpuid.c +0 -1
@@ -33,7 +33,6 @@#include <linux/init.h> #include <linux/poll.h> #include <linux/smp.h> -#include <linux/smp_lock.h> #include <linux/major.h> #include <linux/fs.h> #include <linux/device.h>
arch/x86/kernel/msr.c +0 -1
@@ -30,7 +30,6 @@#include <linux/init.h> #include <linux/poll.h> #include <linux/smp.h> -#include <linux/smp_lock.h> #include <linux/major.h> #include <linux/fs.h> #include <linux/device.h>
block/compat_ioctl.c +0 -1
@@ -8,7 +8,6 @@#include <linux/hdreg.h> #include <linux/slab.h> #include <linux/syscalls.h> -#include <linux/smp_lock.h> #include <linux/types.h> #include <linux/uaccess.h>
block/ioctl.c +0 -1
@@ -5,7 +5,6 @@#include <linux/hdreg.h> #include <linux/backing-dev.h> #include <linux/buffer_head.h> -#include <linux/smp_lock.h> #include <linux/blktrace_api.h> #include <asm/uaccess.h>
drivers/block/drbd/drbd_receiver.c +0 -1
@@ -36,7 +36,6 @@#include <linux/memcontrol.h> #include <linux/mm_inline.h> #include <linux/slab.h> -#include <linux/smp_lock.h> #include <linux/pkt_sched.h> #define __KERNEL_SYSCALLS__#include <linux/unistd.h>
drivers/block/drbd/drbd_worker.c +0 -1
@@ -26,7 +26,6 @@#include <linux/module.h> #include <linux/drbd.h> #include <linux/sched.h> -#include <linux/smp_lock.h> #include <linux/wait.h> #include <linux/mm.h> #include <linux/memcontrol.h>
drivers/char/agp/frontend.c +0 -1
@@ -39,7 +39,6 @@#include <linux/mm.h> #include <linux/fs.h> #include <linux/sched.h> -#include <linux/smp_lock.h> #include <asm/uaccess.h> #include <asm/pgtable.h> #include "agp.h"
drivers/char/amiserial.c +0 -1
@@ -81,7 +81,6 @@ static char *serial_version = "4.30";#include <linux/mm.h> #include <linux/seq_file.h> #include <linux/slab.h> -#include <linux/smp_lock.h> #include <linux/init.h> #include <linux/bitops.h> #include <linux/platform_device.h>
drivers/char/briq_panel.c +0 -1
@@ -6,7 +6,6 @@#include <linux/module.h> -#include <linux/smp_lock.h> #include <linux/types.h> #include <linux/errno.h> #include <linux/tty.h>
drivers/char/hpet.c +0 -1
@@ -14,7 +14,6 @@#include <linux/interrupt.h> #include <linux/module.h> #include <linux/kernel.h> -#include <linux/smp_lock.h> #include <linux/types.h> #include <linux/miscdevice.h> #include <linux/major.h>
drivers/char/hw_random/core.c +0 -1
@@ -37,7 +37,6 @@#include <linux/kernel.h> #include <linux/fs.h> #include <linux/sched.h> -#include <linux/smp_lock.h> #include <linux/init.h> #include <linux/miscdevice.h> #include <linux/delay.h>
drivers/char/istallion.c +0 -1
@@ -21,7 +21,6 @@#include <linux/module.h> #include <linux/sched.h> #include <linux/slab.h> -#include <linux/smp_lock.h> #include <linux/interrupt.h> #include <linux/tty.h> #include <linux/tty_flip.h>
drivers/char/serial167.c +0 -1
@@ -52,7 +52,6 @@#include <linux/interrupt.h> #include <linux/serial.h> #include <linux/serialP.h> -#include <linux/smp_lock.h> #include <linux/string.h> #include <linux/fcntl.h> #include <linux/ptrace.h>
drivers/char/specialix.c +0 -1
@@ -87,7 +87,6 @@#include <linux/tty_flip.h> #include <linux/mm.h> #include <linux/serial.h> -#include <linux/smp_lock.h> #include <linux/fcntl.h> #include <linux/major.h> #include <linux/delay.h>
drivers/char/stallion.c +0 -1
@@ -40,7 +40,6 @@#include <linux/stallion.h> #include <linux/ioport.h> #include <linux/init.h> -#include <linux/smp_lock.h> #include <linux/device.h> #include <linux/delay.h> #include <linux/ctype.h>
drivers/char/sx.c +0 -1
@@ -216,7 +216,6 @@#include <linux/eisa.h> #include <linux/pci.h> #include <linux/slab.h> -#include <linux/smp_lock.h> #include <linux/init.h> #include <linux/miscdevice.h> #include <linux/bitops.h>
drivers/char/uv_mmtimer.c +0 -1
@@ -23,7 +23,6 @@#include <linux/interrupt.h> #include <linux/time.h> #include <linux/math64.h> -#include <linux/smp_lock.h> #include <asm/genapic.h> #include <asm/uv/uv_hub.h>
drivers/gpu/drm/drm_fops.c +0 -1
@@ -37,7 +37,6 @@#include "drmP.h" #include <linux/poll.h> #include <linux/slab.h> -#include <linux/smp_lock.h> /* from BKL pushdown: note that nothing else serializes idr_find() */ DEFINE_MUTEX (drm_global_mutex);
drivers/hid/hidraw.c +0 -1
@@ -32,7 +32,6 @@#include <linux/hid.h> #include <linux/mutex.h> #include <linux/sched.h> -#include <linux/smp_lock.h> #include <linux/hidraw.h>
drivers/hid/usbhid/hiddev.c +0 -1
@@ -29,7 +29,6 @@#include <linux/slab.h> #include <linux/module.h> #include <linux/init.h> -#include <linux/smp_lock.h> #include <linux/input.h> #include <linux/usb.h> #include <linux/hid.h>
drivers/infiniband/hw/ipath/ipath_file_ops.c +0 -1
@@ -40,7 +40,6 @@#include <linux/highmem.h> #include <linux/io.h> #include <linux/jiffies.h> -#include <linux/smp_lock.h> #include <asm/pgtable.h> #include "ipath_kernel.h"
drivers/input/input.c +0 -1
@@ -24,7 +24,6 @@#include <linux/device.h> #include <linux/mutex.h> #include <linux/rcupdate.h> -#include <linux/smp_lock.h> #include "input-compat.h" MODULE_AUTHOR ("Vojtech Pavlik <[email protected]>" );
drivers/input/serio/serio_raw.c +0 -1
@@ -11,7 +11,6 @@#include <linux/sched.h> #include <linux/slab.h> -#include <linux/smp_lock.h> #include <linux/poll.h> #include <linux/module.h> #include <linux/serio.h>
drivers/media/dvb/dvb-core/dvb_ca_en50221.c +0 -1
@@ -36,7 +36,6 @@#include <linux/delay.h> #include <linux/spinlock.h> #include <linux/sched.h> -#include <linux/smp_lock.h> #include <linux/kthread.h> #include "dvb_ca_en50221.h"
drivers/media/dvb/dvb-core/dvb_frontend.c +0 -1
@@ -36,7 +36,6 @@#include <linux/list.h> #include <linux/freezer.h> #include <linux/jiffies.h> -#include <linux/smp_lock.h> #include <linux/kthread.h> #include <asm/processor.h>
drivers/media/dvb/ngene/ngene-core.c +0 -1
@@ -34,7 +34,6 @@#include <linux/io.h> #include <asm/div64.h> #include <linux/pci.h> -#include <linux/smp_lock.h> #include <linux/timer.h> #include <linux/byteorder/generic.h> #include <linux/firmware.h>
drivers/media/dvb/ngene/ngene-dvb.c +0 -1
@@ -35,7 +35,6 @@#include <linux/io.h> #include <asm/div64.h> #include <linux/pci.h> -#include <linux/smp_lock.h> #include <linux/timer.h> #include <linux/byteorder/generic.h> #include <linux/firmware.h>
drivers/media/dvb/ngene/ngene-i2c.c +0 -1
@@ -37,7 +37,6 @@#include <asm/div64.h> #include <linux/pci.h> #include <linux/pci_ids.h> -#include <linux/smp_lock.h> #include <linux/timer.h> #include <linux/byteorder/generic.h> #include <linux/firmware.h>
drivers/media/radio/radio-mr800.c +0 -1
@@ -58,7 +58,6 @@#include <linux/module.h> #include <linux/init.h> #include <linux/slab.h> -#include <linux/smp_lock.h> #include <linux/input.h> #include <linux/videodev2.h> #include <media/v4l2-device.h>
drivers/media/radio/si470x/radio-si470x.h +0 -1
@@ -31,7 +31,6 @@#include <linux/init.h> #include <linux/sched.h> #include <linux/slab.h> -#include <linux/smp_lock.h> #include <linux/input.h> #include <linux/version.h> #include <linux/videodev2.h>
drivers/media/video/bt8xx/bttv-driver.c +0 -1
@@ -42,7 +42,6 @@#include <linux/fs.h> #include <linux/kernel.h> #include <linux/sched.h> -#include <linux/smp_lock.h> #include <linux/interrupt.h> #include <linux/kdev_t.h> #include "bttvp.h"
drivers/media/video/cx88/cx88-blackbird.c +0 -1
@@ -33,7 +33,6 @@#include <linux/delay.h> #include <linux/device.h> #include <linux/firmware.h> -#include <linux/smp_lock.h> #include <media/v4l2-common.h> #include <media/v4l2-ioctl.h> #include <media/cx2341x.h>
drivers/media/video/cx88/cx88-video.c +0 -1
@@ -31,7 +31,6 @@#include <linux/kmod.h> #include <linux/kernel.h> #include <linux/slab.h> -#include <linux/smp_lock.h> #include <linux/interrupt.h> #include <linux/dma-mapping.h> #include <linux/delay.h>
drivers/media/video/pwc/pwc-if.c +0 -1
@@ -62,7 +62,6 @@#include <linux/module.h> #include <linux/poll.h> #include <linux/slab.h> -#include <linux/smp_lock.h> #ifdef CONFIG_USB_PWC_INPUT_EVDEV #include <linux/usb/input.h> #endif
drivers/media/video/s2255drv.c +0 -1
@@ -49,7 +49,6 @@#include <linux/videodev2.h> #include <linux/version.h> #include <linux/mm.h> -#include <linux/smp_lock.h> #include <media/videobuf-vmalloc.h> #include <media/v4l2-common.h> #include <media/v4l2-device.h>
drivers/media/video/saa7134/saa7134-empress.c +0 -1
@@ -21,7 +21,6 @@#include <linux/list.h> #include <linux/module.h> #include <linux/kernel.h> -#include <linux/smp_lock.h> #include <linux/delay.h> #include "saa7134-reg.h"
drivers/media/video/saa7164/saa7164.h +0 -1
@@ -58,7 +58,6 @@#include <media/tveeprom.h> #include <media/videobuf-dma-sg.h> #include <media/videobuf-dvb.h> -#include <linux/smp_lock.h> #include <dvb_demux.h> #include <dvb_frontend.h> #include <dvb_net.h>
drivers/media/video/usbvision/usbvision-video.c +0 -1
@@ -50,7 +50,6 @@#include <linux/list.h> #include <linux/timer.h> #include <linux/slab.h> -#include <linux/smp_lock.h> #include <linux/mm.h> #include <linux/highmem.h> #include <linux/vmalloc.h>
drivers/media/video/v4l2-compat-ioctl32.c +0 -1
@@ -18,7 +18,6 @@#include <linux/videodev.h> #include <linux/videodev2.h> #include <linux/module.h> -#include <linux/smp_lock.h> #include <media/v4l2-ioctl.h> #ifdef CONFIG_COMPAT
drivers/net/wireless/orinoco/orinoco_usb.c +0 -1
@@ -57,7 +57,6 @@#include <linux/fcntl.h> #include <linux/spinlock.h> #include <linux/list.h> -#include <linux/smp_lock.h> #include <linux/usb.h> #include <linux/timer.h>
drivers/parisc/eisa_eeprom.c +0 -1
@@ -24,7 +24,6 @@#include <linux/kernel.h> #include <linux/miscdevice.h> #include <linux/slab.h> -#include <linux/smp_lock.h> #include <linux/fs.h> #include <asm/io.h> #include <asm/uaccess.h>
drivers/pci/proc.c +0 -1
@@ -10,7 +10,6 @@#include <linux/module.h> #include <linux/proc_fs.h> #include <linux/seq_file.h> -#include <linux/smp_lock.h> #include <linux/capability.h> #include <asm/uaccess.h> #include <asm/byteorder.h>
drivers/pnp/isapnp/proc.c +0 -1
@@ -21,7 +21,6 @@#include <linux/isapnp.h> #include <linux/proc_fs.h> #include <linux/init.h> -#include <linux/smp_lock.h> #include <asm/uaccess.h> extern struct pnp_protocol isapnp_protocol;
drivers/s390/block/dasd_eer.c +0 -1
@@ -17,7 +17,6 @@#include <linux/device.h> #include <linux/poll.h> #include <linux/mutex.h> -#include <linux/smp_lock.h> #include <linux/err.h> #include <linux/slab.h>
drivers/s390/char/fs3270.c +0 -1
@@ -14,7 +14,6 @@#include <linux/list.h> #include <linux/slab.h> #include <linux/types.h> -#include <linux/smp_lock.h> #include <asm/compat.h> #include <asm/ccwdev.h>
drivers/s390/char/tape_char.c +0 -1
@@ -17,7 +17,6 @@#include <linux/types.h> #include <linux/proc_fs.h> #include <linux/mtio.h> -#include <linux/smp_lock.h> #include <linux/compat.h> #include <asm/uaccess.h>
drivers/s390/char/vmlogrdr.c +0 -1
@@ -30,7 +30,6 @@#include <linux/kmod.h> #include <linux/cdev.h> #include <linux/device.h> -#include <linux/smp_lock.h> #include <linux/string.h> MODULE_AUTHOR
drivers/s390/char/vmur.c +0 -1
@@ -13,7 +13,6 @@#include <linux/cdev.h> #include <linux/slab.h> -#include <linux/smp_lock.h> #include <asm/uaccess.h> #include <asm/cio.h>
drivers/s390/crypto/zcrypt_api.c +0 -1
@@ -35,7 +35,6 @@#include <linux/proc_fs.h> #include <linux/seq_file.h> #include <linux/compat.h> -#include <linux/smp_lock.h> #include <linux/slab.h> #include <asm/atomic.h> #include <asm/uaccess.h>
drivers/scsi/hpsa.c +0 -1
@@ -31,7 +31,6 @@#include <linux/seq_file.h> #include <linux/init.h> #include <linux/spinlock.h> -#include <linux/smp_lock.h> #include <linux/compat.h> #include <linux/blktrace_api.h> #include <linux/uaccess.h>
drivers/scsi/pm8001/pm8001_sas.h +0 -1
@@ -50,7 +50,6 @@#include <linux/dma-mapping.h> #include <linux/pci.h> #include <linux/interrupt.h> -#include <linux/smp_lock.h> #include <scsi/libsas.h> #include <scsi/scsi_tcq.h> #include <scsi/sas_ata.h>
drivers/scsi/sd.c +0 -1
@@ -46,7 +46,6 @@#include <linux/blkdev.h> #include <linux/blkpg.h> #include <linux/delay.h> -#include <linux/smp_lock.h> #include <linux/mutex.h> #include <linux/string_helpers.h> #include <linux/async.h>
drivers/serial/crisv10.c +0 -1
@@ -18,7 +18,6 @@ static char *serial_version = "$Revision: 1.25 $";#include <linux/tty.h> #include <linux/tty_flip.h> #include <linux/major.h> -#include <linux/smp_lock.h> #include <linux/string.h> #include <linux/fcntl.h> #include <linux/mm.h>
drivers/serial/serial_core.c +0 -1
@@ -29,7 +29,6 @@#include <linux/console.h> #include <linux/proc_fs.h> #include <linux/seq_file.h> -#include <linux/smp_lock.h> #include <linux/device.h> #include <linux/serial.h> /* for serial_state and serial_icounter_struct */ #include <linux/serial_core.h>
drivers/staging/cx25821/cx25821.h +0 -1
@@ -31,7 +31,6 @@#include <linux/delay.h> #include <linux/sched.h> #include <linux/kdev_t.h> -#include <linux/smp_lock.h> #include <media/v4l2-common.h> #include <media/v4l2-device.h>
drivers/staging/easycap/easycap.h +0 -1
@@ -77,7 +77,6 @@#include <linux/slab.h> #include <linux/module.h> #include <linux/kref.h> -#include <linux/smp_lock.h> #include <linux/usb.h> #include <linux/uaccess.h>
drivers/staging/intel_sst/intel_sst_app_interface.c +0 -1
@@ -34,7 +34,6 @@#include <linux/uaccess.h> #include <linux/firmware.h> #include <linux/ioctl.h> -#include <linux/smp_lock.h> #ifdef CONFIG_MRST_RAR_HANDLER #include <linux/rar_register.h> #include "../../../drivers/staging/memrar/memrar.h"
drivers/staging/rtl8712/osdep_service.h +0 -1
@@ -22,7 +22,6 @@#include <linux/module.h> #include <linux/sched.h> #include <linux/kref.h> -#include <linux/smp_lock.h> #include <linux/netdevice.h> #include <linux/skbuff.h> #include <linux/usb.h>
drivers/staging/speakup/buffers.c +0 -1
@@ -1,5 +1,4 @@#include <linux/console.h> -#include <linux/smp_lock.h> #include <linux/types.h> #include <linux/wait.h>
drivers/usb/core/devices.c +0 -1
@@ -54,7 +54,6 @@#include <linux/gfp.h> #include <linux/poll.h> #include <linux/usb.h> -#include <linux/smp_lock.h> #include <linux/usbdevice_fs.h> #include <linux/usb/hcd.h> #include <linux/mutex.h>
drivers/usb/core/devio.c +0 -1
@@ -37,7 +37,6 @@#include <linux/fs.h> #include <linux/mm.h> #include <linux/slab.h> -#include <linux/smp_lock.h> #include <linux/signal.h> #include <linux/poll.h> #include <linux/module.h>
drivers/usb/core/file.c +0 -1
@@ -19,7 +19,6 @@#include <linux/errno.h> #include <linux/rwsem.h> #include <linux/slab.h> -#include <linux/smp_lock.h> #include <linux/usb.h> #include "usb.h"
drivers/usb/core/inode.c +0 -1
@@ -39,7 +39,6 @@#include <linux/parser.h> #include <linux/notifier.h> #include <linux/seq_file.h> -#include <linux/smp_lock.h> #include <linux/usb/hcd.h> #include <asm/byteorder.h> #include "usb.h"
drivers/usb/gadget/f_fs.c +0 -1
@@ -30,7 +30,6 @@#include <linux/blkdev.h> #include <linux/pagemap.h> #include <asm/unaligned.h> -#include <linux/smp_lock.h> #include <linux/usb/composite.h> #include <linux/usb/functionfs.h>
drivers/usb/gadget/f_hid.c +0 -1
@@ -25,7 +25,6 @@#include <linux/cdev.h> #include <linux/mutex.h> #include <linux/poll.h> -#include <linux/smp_lock.h> #include <linux/uaccess.h> #include <linux/wait.h> #include <linux/usb/g_hid.h>
drivers/usb/host/isp1362-hcd.c +0 -1
@@ -70,7 +70,6 @@#include <linux/ioport.h> #include <linux/sched.h> #include <linux/slab.h> -#include <linux/smp_lock.h> #include <linux/errno.h> #include <linux/init.h> #include <linux/list.h>
drivers/usb/host/uhci-debug.c +0 -1
@@ -12,7 +12,6 @@#include <linux/slab.h> #include <linux/kernel.h> #include <linux/debugfs.h> -#include <linux/smp_lock.h> #include <asm/io.h> #include "uhci-hcd.h"
drivers/usb/mon/mon_bin.c +0 -1
@@ -15,7 +15,6 @@#include <linux/poll.h> #include <linux/compat.h> #include <linux/mm.h> -#include <linux/smp_lock.h> #include <linux/scatterlist.h> #include <linux/slab.h>
drivers/usb/mon/mon_stat.c +0 -1
@@ -11,7 +11,6 @@#include <linux/slab.h> #include <linux/usb.h> #include <linux/fs.h> -#include <linux/smp_lock.h> #include <asm/uaccess.h> #include "usb_mon.h"
drivers/usb/serial/usb-serial.c +0 -1
@@ -21,7 +21,6 @@#include <linux/errno.h> #include <linux/init.h> #include <linux/slab.h> -#include <linux/smp_lock.h> #include <linux/tty.h> #include <linux/tty_driver.h> #include <linux/tty_flip.h>
drivers/video/console/vgacon.c +0 -1
@@ -47,7 +47,6 @@#include <linux/ioport.h> #include <linux/init.h> #include <linux/screen_info.h> -#include <linux/smp_lock.h> #include <video/vga.h> #include <asm/io.h>
drivers/xen/xenfs/privcmd.c +0 -1
@@ -15,7 +15,6 @@#include <linux/mman.h> #include <linux/uaccess.h> #include <linux/swap.h> -#include <linux/smp_lock.h> #include <linux/highmem.h> #include <linux/pagemap.h> #include <linux/seq_file.h>
drivers/zorro/proc.c +0 -1
@@ -13,7 +13,6 @@#include <linux/proc_fs.h> #include <linux/seq_file.h> #include <linux/init.h> -#include <linux/smp_lock.h> #include <asm/uaccess.h> #include <asm/amigahw.h> #include <asm/setup.h>
fs/block_dev.c +0 -1
@@ -11,7 +11,6 @@#include <linux/slab.h> #include <linux/kmod.h> #include <linux/major.h> -#include <linux/smp_lock.h> #include <linux/device_cgroup.h> #include <linux/highmem.h> #include <linux/blkdev.h>
fs/ceph/inode.c +0 -1
@@ -2,7 +2,6 @@#include <linux/module.h> #include <linux/fs.h> -#include <linux/smp_lock.h> #include <linux/slab.h> #include <linux/string.h> #include <linux/uaccess.h>
fs/ceph/mds_client.c +0 -1
@@ -6,7 +6,6 @@#include <linux/sched.h> #include <linux/debugfs.h> #include <linux/seq_file.h> -#include <linux/smp_lock.h> #include "super.h" #include "mds_client.h"
fs/compat_ioctl.c +0 -1
@@ -19,7 +19,6 @@#include <linux/compiler.h> #include <linux/sched.h> #include <linux/smp.h> -#include <linux/smp_lock.h> #include <linux/ioctl.h> #include <linux/if.h> #include <linux/if_bridge.h>
fs/ecryptfs/super.c +0 -1
@@ -28,7 +28,6 @@#include <linux/key.h> #include <linux/slab.h> #include <linux/seq_file.h> -#include <linux/smp_lock.h> #include <linux/file.h> #include <linux/crypto.h> #include "ecryptfs_kernel.h"
fs/ext3/super.c +0 -1
@@ -27,7 +27,6 @@#include <linux/init.h> #include <linux/blkdev.h> #include <linux/parser.h> -#include <linux/smp_lock.h> #include <linux/buffer_head.h> #include <linux/exportfs.h> #include <linux/vfs.h>
fs/ioctl.c +0 -1
@@ -6,7 +6,6 @@#include <linux/syscalls.h> #include <linux/mm.h> -#include <linux/smp_lock.h> #include <linux/capability.h> #include <linux/file.h> #include <linux/fs.h>
fs/lockd/clntlock.c +0 -1
@@ -14,7 +14,6 @@#include <linux/sunrpc/clnt.h> #include <linux/sunrpc/svc.h> #include <linux/lockd/lockd.h> -#include <linux/smp_lock.h> #include <linux/kthread.h> #define NLMDBG_FACILITY NLMDBG_CLIENT
fs/lockd/clntproc.c +0 -1
@@ -7,7 +7,6 @@*/ #include <linux/module.h> -#include <linux/smp_lock.h> #include <linux/slab.h> #include <linux/types.h> #include <linux/errno.h>
fs/lockd/svc4proc.c +0 -1
@@ -9,7 +9,6 @@#include <linux/types.h> #include <linux/time.h> -#include <linux/smp_lock.h> #include <linux/lockd/lockd.h> #include <linux/lockd/share.h>
fs/lockd/svclock.c +0 -1
@@ -25,7 +25,6 @@#include <linux/errno.h> #include <linux/kernel.h> #include <linux/sched.h> -#include <linux/smp_lock.h> #include <linux/sunrpc/clnt.h> #include <linux/sunrpc/svc.h> #include <linux/lockd/nlm.h>
fs/lockd/svcproc.c +0 -1
@@ -9,7 +9,6 @@#include <linux/types.h> #include <linux/time.h> -#include <linux/smp_lock.h> #include <linux/lockd/lockd.h> #include <linux/lockd/share.h>
fs/locks.c +0 -1
@@ -122,7 +122,6 @@#include <linux/module.h> #include <linux/security.h> #include <linux/slab.h> -#include <linux/smp_lock.h> #include <linux/syscalls.h> #include <linux/time.h> #include <linux/rcupdate.h>
fs/namespace.c +0 -1
@@ -13,7 +13,6 @@#include <linux/sched.h> #include <linux/spinlock.h> #include <linux/percpu.h> -#include <linux/smp_lock.h> #include <linux/init.h> #include <linux/kernel.h> #include <linux/acct.h>
fs/ncpfs/dir.c +0 -1
@@ -19,7 +19,6 @@#include <linux/mm.h> #include <asm/uaccess.h> #include <asm/byteorder.h> -#include <linux/smp_lock.h> #include <linux/ncp_fs.h>
fs/ncpfs/file.c +0 -1
@@ -17,7 +17,6 @@#include <linux/mm.h> #include <linux/vmalloc.h> #include <linux/sched.h> -#include <linux/smp_lock.h> #include <linux/ncp_fs.h> #include "ncplib_kernel.h"
fs/ncpfs/inode.c +0 -1
@@ -26,7 +26,6 @@#include <linux/slab.h> #include <linux/vmalloc.h> #include <linux/init.h> -#include <linux/smp_lock.h> #include <linux/vfs.h> #include <linux/mount.h> #include <linux/seq_file.h>
fs/ncpfs/ioctl.c +0 -1
@@ -17,7 +17,6 @@#include <linux/mount.h> #include <linux/slab.h> #include <linux/highuid.h> -#include <linux/smp_lock.h> #include <linux/vmalloc.h> #include <linux/sched.h>
fs/nfs/callback.c +0 -1
@@ -9,7 +9,6 @@#include <linux/completion.h> #include <linux/ip.h> #include <linux/module.h> -#include <linux/smp_lock.h> #include <linux/sunrpc/svc.h> #include <linux/sunrpc/svcsock.h> #include <linux/nfs_fs.h>
fs/nfs/delegation.c +0 -1
@@ -11,7 +11,6 @@#include <linux/module.h> #include <linux/sched.h> #include <linux/slab.h> -#include <linux/smp_lock.h> #include <linux/spinlock.h> #include <linux/nfs4.h>
fs/nfs/super.c +0 -1
@@ -39,7 +39,6 @@#include <linux/nfs_mount.h> #include <linux/nfs4_mount.h> #include <linux/lockd/bind.h> -#include <linux/smp_lock.h> #include <linux/seq_file.h> #include <linux/mount.h> #include <linux/mnt_namespace.h>
fs/ocfs2/super.c +0 -1
@@ -41,7 +41,6 @@#include <linux/mount.h> #include <linux/seq_file.h> #include <linux/quotaops.h> -#include <linux/smp_lock.h> #define MLOG_MASK_PREFIX ML_SUPER#include <cluster/masklog.h>
fs/proc/inode.c +0 -1
@@ -16,7 +16,6 @@#include <linux/limits.h> #include <linux/init.h> #include <linux/module.h> -#include <linux/smp_lock.h> #include <linux/sysctl.h> #include <linux/slab.h>
fs/read_write.c +0 -1
@@ -9,7 +9,6 @@#include <linux/fcntl.h> #include <linux/file.h> #include <linux/uio.h> -#include <linux/smp_lock.h> #include <linux/fsnotify.h> #include <linux/security.h> #include <linux/module.h>
fs/reiserfs/inode.c +0 -1
@@ -8,7 +8,6 @@#include <linux/reiserfs_acl.h> #include <linux/reiserfs_xattr.h> #include <linux/exportfs.h> -#include <linux/smp_lock.h> #include <linux/pagemap.h> #include <linux/highmem.h> #include <linux/slab.h>
fs/reiserfs/ioctl.c +0 -1
@@ -9,7 +9,6 @@#include <linux/time.h> #include <asm/uaccess.h> #include <linux/pagemap.h> -#include <linux/smp_lock.h> #include <linux/compat.h> /*
fs/reiserfs/journal.c +0 -1
@@ -43,7 +43,6 @@#include <linux/fcntl.h> #include <linux/stat.h> #include <linux/string.h> -#include <linux/smp_lock.h> #include <linux/buffer_head.h> #include <linux/workqueue.h> #include <linux/writeback.h>
fs/reiserfs/super.c +0 -1
@@ -28,7 +28,6 @@#include <linux/mount.h> #include <linux/namei.h> #include <linux/crc32.h> -#include <linux/smp_lock.h> struct file_system_type reiserfs_fs_type;
include/linux/hardirq.h +0 -1
@@ -3,7 +3,6 @@#include <linux/preempt.h> #ifdef CONFIG_PREEMPT -#include <linux/smp_lock.h> #endif #include <linux/lockdep.h> #include <linux/ftrace_irq.h>
include/linux/reiserfs_fs.h +0 -1
@@ -22,7 +22,6 @@#include <asm/unaligned.h> #include <linux/bitops.h> #include <linux/proc_fs.h> -#include <linux/smp_lock.h> #include <linux/buffer_head.h> #include <linux/reiserfs_fs_i.h> #include <linux/reiserfs_fs_sb.h>
include/linux/tty.h +0 -1
@@ -13,7 +13,6 @@#include <linux/tty_driver.h> #include <linux/tty_ldisc.h> #include <linux/mutex.h> -#include <linux/smp_lock.h> #include <asm/system.h>
init/main.c +0 -1
@@ -20,7 +20,6 @@#include <linux/delay.h> #include <linux/ioport.h> #include <linux/init.h> -#include <linux/smp_lock.h> #include <linux/initrd.h> #include <linux/bootmem.h> #include <linux/acpi.h>
kernel/trace/trace.c +0 -1
@@ -17,7 +17,6 @@#include <linux/writeback.h> #include <linux/kallsyms.h> #include <linux/seq_file.h> -#include <linux/smp_lock.h> #include <linux/notifier.h> #include <linux/irqflags.h> #include <linux/debugfs.h>
net/irda/af_irda.c +0 -1
@@ -45,7 +45,6 @@#include <linux/capability.h> #include <linux/module.h> #include <linux/types.h> -#include <linux/smp_lock.h> #include <linux/socket.h> #include <linux/sockios.h> #include <linux/slab.h>
net/irda/irnet/irnet_ppp.c +0 -1
@@ -15,7 +15,6 @@#include <linux/sched.h> #include <linux/slab.h> -#include <linux/smp_lock.h> #include "irnet_ppp.h" /* Private header */ /* Please put other headers in irnet.h - Thanks */
net/sunrpc/svc_xprt.c +0 -1
@@ -5,7 +5,6 @@*/ #include <linux/sched.h> -#include <linux/smp_lock.h> #include <linux/errno.h> #include <linux/freezer.h> #include <linux/kthread.h>
sound/core/info.c +0 -1
@@ -23,7 +23,6 @@#include <linux/time.h> #include <linux/mm.h> #include <linux/slab.h> -#include <linux/smp_lock.h> #include <linux/string.h> #include <sound/core.h> #include <sound/minors.h>
sound/core/pcm_native.c +0 -1
@@ -22,7 +22,6 @@#include <linux/mm.h> #include <linux/file.h> #include <linux/slab.h> -#include <linux/smp_lock.h> #include <linux/time.h> #include <linux/pm_qos_params.h> #include <linux/uio.h>
sound/core/sound.c +0 -1
@@ -21,7 +21,6 @@#include <linux/init.h> #include <linux/slab.h> -#include <linux/smp_lock.h> #include <linux/time.h> #include <linux/device.h> #include <linux/moduleparam.h>
sound/sound_core.c +0 -1
@@ -104,7 +104,6 @@ module_exit(cleanup_soundcore);#include <linux/init.h> #include <linux/slab.h> -#include <linux/smp_lock.h> #include <linux/types.h> #include <linux/kernel.h> #include <linux/sound.h>
Signature · 1 line
1.7.1
Arnd Bergmann
maintainerPATCH 4/7 BKL: remove references to lock_kernel from comments
In reply to Arnd BergmannLock_kernel is gone from the code, so the comments should be updated, too. nfsd now uses lock_flocks instead of lock_kernel to protect against posix file locks.
--- fs/nfsd/nfs4state.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
fs/nfsd/nfs4state.c +4 -4
@@ -2254,7 +2254,7 @@ nfs4_file_downgrade(struct nfs4_file *fp, unsigned int share_access)* Spawn a thread to perform a recall on the delegation represented * by the lease (file_lock) * -* Called from break_lease() with lock_kernel() held. +* Called from break_lease() with lock_flocks() held. * Note: we assume break_lease will only call this *once* for any given * lease. */
@@ -2278,7 +2278,7 @@ void nfsd_break_deleg_cb(struct file_lock *fl)list_add_tail (&dp->dl_recall_lru, &del_recall_lru);spin_unlock (&recall_lock); -/* only place dl_time is set. protected by lock_kernel*/ +/* only place dl_time is set. protected by lock_flocks*/ dp->dl_time =get_seconds ();/*
@@ -2295,7 +2295,7 @@ void nfsd_break_deleg_cb(struct file_lock *fl)/* * The file_lock is being reapd. * -* Called by locks_free_lock() with lock_kernel() held. +* Called by locks_free_lock() with lock_flocks() held. */ static void nfsd_release_deleg_cb (struct file_lock *fl)
@@ -2310,7 +2310,7 @@ void nfsd_release_deleg_cb(struct file_lock *fl) }/* -* Called from setlease() with lock_kernel() held +* Called from setlease() with lock_flocks() held */ static int nfsd_same_client_deleg_cb (struct file_lock *onlist,struct file_lock *try)
Signature · 1 line
1.7.1
Re: [PATCH 4/7] BKL: remove references to lock_kernel from comments
Quoted 7 lines · Arnd Bergmann
Lock_kernelis gone from the code, so the comments should be updated, too. nfsd now useslock_flocksinstead oflock_kernelto protect against posix file locks.Signed-off-by Arnd Bergmann <[email protected]>Cc "J. Bruce Fields" <[email protected]>
I want to get rid of most of these callbacks, actually; but that can wait for the next merge window.
--b.
Quoted 48 lines
--- fs/nfsd/nfs4state.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)fs/nfsd/nfs4state.c +4
-4@@ -2254,7 +2254,7 @@ nfs4_file_downgrade(struct nfs4_file *fp, unsigned int share_access)* Spawn a thread to perform a recall on the delegation represented * by the lease (file_lock) * -* Called from break_lease() with lock_kernel() held. +* Called from break_lease() with lock_flocks() held. * Note: we assume break_lease will only call this *once* for any given * lease. */ @@ -2278,7 +2278,7 @@ void nfsd_break_deleg_cb(struct file_lock *fl)list_add_tail (&dp->dl_recall_lru, &del_recall_lru);spin_unlock (&recall_lock); -/* only place dl_time is set. protected by lock_kernel*/ +/* only place dl_time is set. protected by lock_flocks*/ dp->dl_time =get_seconds ();/* @@ -2295,7 +2295,7 @@ void nfsd_break_deleg_cb(struct file_lock *fl)/* * The file_lock is being reapd. * -* Called by locks_free_lock() with lock_kernel() held. +* Called by locks_free_lock() with lock_flocks() held. */ static void nfsd_release_deleg_cb (struct file_lock *fl)@@ -2310,7 +2310,7 @@ void nfsd_release_deleg_cb(struct file_lock *fl) }/* -* Called from setlease() with lock_kernel() held +* Called from setlease() with lock_flocks() held */ static int nfsd_same_client_deleg_cb (struct file_lock *onlist,struct file_lock *try)Signature · 1 line
1.7.1
Arnd Bergmann
maintainerPATCH 5/7 BKL: disable by default
In reply to Arnd BergmannAs discussed at the kernel summit, this change disables the big kernel lock by default. It is still possible to enable it in order to build the modules that use it.
--- lib/Kconfig.debug | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
lib/Kconfig.debug +4 -4
@@ -471,12 +471,12 @@ config DEBUG_MUTEXES config BKL bool "Big Kernel Lock" if (SMP || PREEMPT) - default y + default !(SMP || PREEMPT) help This is the traditional lock that is used in old code instead - of proper locking. All drivers that use the BKL should depend - on this symbol. - Say Y here unless you are working on removing the BKL. + of proper locking. The big kernel lock will go away in 2.6.39, + so all modules that still depend on it need to be changed or + they will be removed as well. config DEBUG_LOCK_ALLOC bool "Lock debugging: detect incorrect freeing of live locks"
Signature · 1 line
1.7.1
Arnd Bergmann
maintainerPATCH 6/7 BKL: mark lock_kernel as deprecated
In reply to Arnd BergmannNo new code should use the big kernel lock, so we should really emit compiler warnings to make people building out of mainline code aware of this.
Remove the unused cycle_kernel_lock() functions as well, so we don't cause unnecessary build warnings.
--- include/linux/smp_lock.h | 15 ++------------- 1 files changed, 2 insertions(+), 13 deletions(-)
include/linux/smp_lock.h +2 -13
@@ -26,10 +26,12 @@ static inline int reacquire_kernel_lock(struct task_struct *task) extern void __lockfunc _lock_kernel(const char *func, const char *file, int line) +__deprecated __acquires(kernel_lock); extern void __lockfunc _unlock_kernel(const char *func, const char *file, int line) +__deprecated __releases(kernel_lock); #define lock_kernel() do { \
@@ -40,24 +42,11 @@ __releases(kernel_lock);_unlock_kernel (__func__, __FILE__, __LINE__); \ } while (0) -/* -* Various legacy drivers don't really need the BKL in a specific -* function, but they *do* need to know that the BKL became available. -* This function just avoids wrapping a bunch of lock/unlock pairs -* around code which doesn't really need it. -*/ -static inline void cycle_kernel_lock(void) -{ -lock_kernel (); -unlock_kernel (); -} - #else#ifdef CONFIG_BKL /* provoke build bug if not set */ #define lock_kernel ()#define unlock_kernel () -#define cycle_kernel_lock () do { } while(0)#define kernel_locked () 1#endif /* CONFIG_BKL */
Signature · 1 line
1.7.1
Arnd Bergmann
maintainerPATCH 7/7 BKL: move CONFIG_BKL to staging
In reply to Arnd BergmannInstead of moving the actual code to staging for stuff that depends on CONFIG_BKL, this moves just the configuration option it depends on.
As a consequence, the remaining non-staging drivers that use the BKL (i830, appletalk, ipx, x25, adfs, hpfs and ufs) implicitly depend on staging until they get fixed.
This sets 2.6.39 as the arbitrary date when we actually remove the option along with its last users.
--- drivers/staging/Kconfig | 11 +++++++++++ lib/Kconfig.debug | 9 --------- 2 files changed, 11 insertions(+), 9 deletions(-)
drivers/staging/Kconfig +11 -0
@@ -41,6 +41,17 @@ config STAGING_EXCLUDE_BUILD if !STAGING_EXCLUDE_BUILD +config BKL + bool "Include drivers that depend on the Big Kernel Lock" if (SMP || PREEMPT) + default !(SMP || PREEMPT) + help + This is the traditional lock that is used in old code instead + of proper locking. All drivers that use the BKL should depend + on this symbol. + A small number of drivers still require this. All drivers that + use the BKL should be changed to a better serialisation method + or they will be removed in 2.6.39. + source "drivers/staging/et131x/Kconfig" source "drivers/staging/slicoss/Kconfig"
lib/Kconfig.debug +0 -9
@@ -469,15 +469,6 @@ config DEBUG_MUTEXES This feature allows mutex semantics violations to be detected and reported. -config BKL - bool "Big Kernel Lock" if (SMP || PREEMPT) - default !(SMP || PREEMPT) - help - This is the traditional lock that is used in old code instead - of proper locking. The big kernel lock will go away in 2.6.39, - so all modules that still depend on it need to be changed or - they will be removed as well. - config DEBUG_LOCK_ALLOC bool "Lock debugging: detect incorrect freeing of live locks" depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
Signature · 1 line
1.7.1
Jan Kara
reviewerHi,
Quoted 8 lines · Arnd Bergmann
It seems the v4l and udf code has been worked out now and patches to kill the BKL there are finally making it upstream.
As promised, here are the patches I did since the kernel summit to turn off the BKL by default. Given that -rc2 is out now, I don't know how much of these you still want for 2.6.37, so just pick the ones you like and I'll send a pull request for the rest once the 2.6.38 merge window opens.
Just for info, UDF BKL removal patches seem to work fine but I want to
give them some final SMP testing on Monday before pushing them to -next. I'm not sure how much people hurry with disabling the lock so if I should push them ASAP or whether the next merge window is fine...
Honza
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Quoted 5 lines · Jan Kara
Just for info, UDF BKL removal patches seem to work fine but I want to give them some final SMP testing on Monday before pushing them to -next. I'm not sure how much people hurry with disabling the lock so if I should push them ASAP or whether the next merge window is fine...
I don't think I can reasonably do it in 37, we're late enough in the -rc series. So UDF and really saying 'n' to BKL by default will have to be for the next merge window.
I hate to do it, but I'd be too nervous about it any other way.
Linus
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 7 lines · Linus Torvalds
Quoted 5 lines · Jan Kara
Just for info, UDF BKL removal patches seem to work fine but I want to
give them some final SMP testing on Monday before pushing them to -next. I'm not sure how much people hurry with disabling the lock so if I should push them ASAP or whether the next merge window is fine...
Quoted 7 lines
I don't think I can reasonably do it in 37, we're late enough in the -rc series. So UDF and really saying 'n' to BKL by default will have to be for the next merge window.
I hate to do it, but I'd be too nervous about it any other way.
Linus
Could it not default to "n" but be SELECTed by the like of UDF. Or that too big of a Kconfig change for 37-rcX? I understand it does not really buy us anything for distro's with allmodconfig style, but it should help with defconfig on all the other ARCH's.
Thanks
Boaz
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 10 lines · Boaz Harrosh
Quoted 4 lines · Linus Torvalds
I don't think I can reasonably do it in 37, we're late enough in the -rc series. So UDF and really saying 'n' to BKL by default will have to be for the next merge window.
Could it not default to "n" but be SELECTed by the like of UDF. Or that too big of a
Kconfigchange for 37-rcX? I understand it does not really buy us anything for distro's with allmodconfig style, but it should help with defconfig on all the other ARCH's.
Yes, I'd be ok with UDF doing a "select BKL" along with a "default n" for BKL itself.
I think UDF currently is the only sane reason to have BKL enabled any more, and yes, it would probably make it easier to configure things.
Tested patch?
Linus
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 5 lines · Linus Torvalds
Yes, I'd be ok with UDF doing a "select BKL" along with a "default n" for BKL itself.
I think UDF currently is the only sane reason to have BKL enabled any more, and yes, it would probably make it easier to configure things.
UFS (which I use) also relies on BKL.
Signature · 1 line
Nick Bowler, Elliptic Technologies (http://www.elliptictech.com/)
Arnd Bergmann
maintainerQuoted 8 lines · On Monday 22 November 2010 16:17:23 Nick Bowler wrote:
Quoted 5 lines · Linus Torvalds
Yes, I'd be ok with UDF doing a "select BKL" along with a "default n" for BKL itself.
I think UDF currently is the only sane reason to have BKL enabled any more, and yes, it would probably make it easier to configure things.
UFS (which I use) also relies on BKL.
Would you mind running a kernel with this patch and lockdep enabled then?
It's quite likely that this doesn't work, but the easiest way to find out is to just try it if you don't understand the code. I can't see anything in the code that relies on the release-on-sleep semantics and there are no obvious recursive lock_kernel() calls.
Anything I've missed should get caught by lockdep. It's unlikely that this patch introduces suble bugs, since the locking only gets stricter. If it breaks, you should get a proper backtrace or a hang that you can debug by looking at the stack.
fs/ufs/Kconfig +0 -1
@@ -1,7 +1,6 @@ config UFS_FS tristate "UFS file system support (read only)" depends on BLOCK - depends on BKL # probably fixable help BSD and derivate versions of Unix (such as SunOS, FreeBSD, NetBSD, OpenBSD and NeXTstep) use a file system called UFS. Some System V
fs/ufs/inode.c +10 -10
@@ -107,7 +107,7 @@ static u64 ufs_frag_map(struct inode *inode, sector_t frag) p = offsets; -lock_kernel (); +lock_ufs ();if ((flags &UFS_TYPE_MASK ) ==UFS_TYPE_UFS2 ) goto ufs2;
@@ -152,7 +152,7 @@ ufs2: ret = temp + (u64) (frag & uspi->s_fpbmask); out: -unlock_kernel (); +unlock_ufs ();return ret; }
@@ -436,7 +436,7 @@ int ufs_getfrag_block(struct inode *inode, sector_t fragment, struct buffer_head ret =0 ; bh =NULL ; -lock_kernel (); +lock_ufs ();UFSD ("ENTER, ino %lu, fragment %llu\n" , inode->i_ino, (unsigned long long )fragment); if (fragment >
@@ -498,7 +498,7 @@ out:set_buffer_new (bh_result);map_bh (bh_result, sb, phys); abort: -unlock_kernel (); +unlock_ufs ();return err; abort_too_big:
@@ -900,9 +900,9 @@ static int ufs_update_inode(struct inode * inode, int do_sync)int ufs_write_inode (struct inode *inode,struct writeback_control *wbc) {int ret; -lock_kernel (); +lock_ufs (); ret =ufs_update_inode (inode, wbc->sync_mode ==WB_SYNC_ALL ); -unlock_kernel (); +unlock_ufs ();return ret; }
@@ -922,22 +922,22 @@ void ufs_evict_inode(struct inode * inode)if (want_delete) {loff_t old_i_size;/*UFS_I(inode)->i_dtime = CURRENT_TIME;*/ -lock_kernel (); +lock_ufs ();mark_inode_dirty (inode);ufs_update_inode (inode,IS_SYNC (inode)); old_i_size = inode->i_size; inode->i_size =0 ;if (inode->i_blocks &&ufs_truncate (inode, old_i_size))ufs_warning (inode->i_sb, __func__,"ufs_truncate failed\n" ); -unlock_kernel (); +unlock_ufs (); }invalidate_inode_buffers (inode);end_writeback (inode);if (want_delete) { -lock_kernel (); +lock_ufs ();ufs_free_inode (inode); -unlock_kernel (); +unlock_ufs (); } }
fs/ufs/namei.c +17 -17
@@ -55,16 +55,16 @@ static struct dentry *ufs_lookup(struct inode * dir, struct dentry *dentry, struif (dentry->d_name.len >UFS_MAXNAMLEN )return ERR_PTR (-ENAMETOOLONG ); -lock_kernel (); +lock_ufs (); ino =ufs_inode_by_name (dir, &dentry->d_name);if (ino) { inode =ufs_iget (dir->i_sb, ino);if (IS_ERR (inode)) { -unlock_kernel (); +unlock_ufs ();return ERR_CAST (inode); } } -unlock_kernel (); +unlock_ufs ();d_add (dentry, inode);return NULL ; }
@@ -93,9 +93,9 @@ static int ufs_create (struct inode * dir, struct dentry * dentry, int mode, inode->i_fop = &ufs_file_operations; inode->i_mapping->a_ops = &ufs_aops;mark_inode_dirty (inode); -lock_kernel (); +lock_ufs (); err =ufs_add_nondir (dentry, inode); -unlock_kernel (); +unlock_ufs (); }UFSD ("END: err=%d\n" , err);return err;
@@ -115,9 +115,9 @@ static int ufs_mknod (struct inode * dir, struct dentry *dentry, int mode, dev_tinit_special_inode (inode, mode, rdev);ufs_set_inode_dev (inode->i_sb,UFS_I (inode), rdev);mark_inode_dirty (inode); -lock_kernel (); +lock_ufs (); err =ufs_add_nondir (dentry, inode); -unlock_kernel (); +unlock_ufs (); }return err; }
@@ -133,7 +133,7 @@ static int ufs_symlink (struct inode * dir, struct dentry * dentry,if (l > sb->s_blocksize) goto out_notlocked; -lock_kernel (); +lock_ufs (); inode =ufs_new_inode (dir,S_IFLNK |S_IRWXUGO ); err =PTR_ERR (inode);if (IS_ERR (inode))
@@ -156,7 +156,7 @@ static int ufs_symlink (struct inode * dir, struct dentry * dentry, err =ufs_add_nondir (dentry, inode); out: -unlock_kernel (); +unlock_ufs (); out_notlocked:return err;
@@ -172,9 +172,9 @@ static int ufs_link (struct dentry * old_dentry, struct inode * dir,struct inode *inode = old_dentry->d_inode;int error; -lock_kernel (); +lock_ufs ();if (inode->i_nlink >=UFS_LINK_MAX ) { -unlock_kernel (); +unlock_ufs ();return -EMLINK ; }
@@ -183,7 +183,7 @@ static int ufs_link (struct dentry * old_dentry, struct inode * dir,ihold (inode); error =ufs_add_nondir (dentry, inode); -unlock_kernel (); +unlock_ufs ();return error; }
@@ -195,7 +195,7 @@ static int ufs_mkdir(struct inode * dir, struct dentry * dentry, int mode)if (dir->i_nlink >=UFS_LINK_MAX ) goto out; -lock_kernel (); +lock_ufs ();inode_inc_link_count (dir); inode =ufs_new_inode (dir,S_IFDIR |mode);
@@ -216,7 +216,7 @@ static int ufs_mkdir(struct inode * dir, struct dentry * dentry, int mode) err =ufs_add_link (dentry, inode);if (err) goto out_fail; -unlock_kernel (); +unlock_ufs ();d_instantiate (dentry, inode); out:
@@ -228,7 +228,7 @@ out_fail:iput (inode); out_dir:inode_dec_link_count (dir); -unlock_kernel (); +unlock_ufs (); goto out; }
@@ -259,7 +259,7 @@ static int ufs_rmdir (struct inode * dir, struct dentry *dentry)struct inode * inode = dentry->d_inode;int err= -ENOTEMPTY ; -lock_kernel (); +lock_ufs ();if (ufs_empty_dir (inode)) { err =ufs_unlink (dir, dentry);if (!err) {
@@ -268,7 +268,7 @@ static int ufs_rmdir (struct inode * dir, struct dentry *dentry)inode_dec_link_count (dir); } } -unlock_kernel (); +unlock_ufs ();return err; }
fs/ufs/super.c +31 -19
169 lines not on this page · raw message
fs/ufs/truncate.c +2 -2
@@ -467,7 +467,7 @@ int ufs_truncate(struct inode *inode, loff_t old_i_size)block_truncate_page (inode->i_mapping, inode->i_size, ufs_getfrag_block); -lock_kernel (); +lock_ufs ();while (1 ) { retry =ufs_trunc_direct (inode); retry |= ufs_trunc_indirect(inode, UFS_IND_BLOCK,
@@ -487,7 +487,7 @@ int ufs_truncate(struct inode *inode, loff_t old_i_size) inode->i_mtime = inode->i_ctime =CURRENT_TIME_SEC ; ufsi->i_lastfrag =DIRECT_FRAGMENT ; -unlock_kernel (); +unlock_ufs ();mark_inode_dirty (inode); out:UFSD ("EXIT: err %d\n" , err);
fs/ufs/ufs.h +3 -0
@@ -154,4 +154,7 @@ static inline u32 ufs_dtogd(struct ufs_sb_private_info * uspi, u64 b) return do_div(b, uspi->s_fpg); } +extern void lock_ufs (void ); +extern void unlock_ufs (void ); +#endif /* _UFS_UFS_H */
Quoted 11 lines · Arnd Bergmann
Quoted 8 lines · On Monday 22 November 2010 16:17:23 Nick Bowler wrote:
Quoted 5 lines · Linus Torvalds
Yes, I'd be ok with UDF doing a "select BKL" along with a "default n" for BKL itself.
I think UDF currently is the only sane reason to have BKL enabled any more, and yes, it would probably make it easier to configure things.
UFS (which I use) also relies on BKL.
Would you mind running a kernel with this patch and lockdep enabled then?
I will definitely try it, but I probably won't get around to it before the new year.
Thanks,
Signature · 1 line
Nick Bowler, Elliptic Technologies (http://www.elliptictech.com/)
Quoted 8 lines · Arnd Bergmann
Quoted 7 lines · On Monday 22 November 2010 16:17:23 Nick Bowler wrote:
Quoted 5 lines · Linus Torvalds
Yes, I'd be ok with UDF doing a "select BKL" along with a "default n" for BKL itself.
I think UDF currently is the only sane reason to have BKL enabled any more, and yes, it would probably make it easier to configure things.
Quoted 9 lines
Quoted 1 line
UFS (which I use) also relies on BKL.
Would you mind running a kernel with this patch and lockdep enabled then?
It's quite likely that this doesn't work, but the easiest way to find out is to just try it if you don't understand the code. I can't see anything in the code that relies on the release-on-sleep semantics and there are no obvious recursive
lock_kernel()calls.
I see one without looking at code (am I missed something?). See below.
fs/ufs/inode.c void ufs_evict_inode(struct inode * inode) · line 925
Quoted 6 lines
fs/ufs/inode.c +1
-1@@ -922,22 +922,22 @@ void ufs_evict_inode(struct inode * inode)if (want_delete) {loff_t old_i_size;/*UFS_I(inode)->i_dtime = CURRENT_TIME;*/ -lock_kernel (); +lock_ufs ();
lock
fs/ufs/inode.c void ufs_evict_inode(struct inode * inode) · line 930
Quoted 5 lines
fs/ufs/inode.c +0
-0mark_inode_dirty (inode);ufs_update_inode (inode,IS_SYNC (inode)); old_i_size = inode->i_size; inode->i_size =0 ;if (inode->i_blocks &&ufs_truncate (inode, old_i_size))
call truncate with lock
Quoted 10 lines
fs/ufs/inode.c +1
-1ufs_warning (inode->i_sb, __func__,"ufs_truncate failed\n" ); -unlock_kernel (); +unlock_ufs (); }fs/ufs/truncate.c +0
-0
fs/ufs/truncate.c int ufs_truncate(struct inode *inode, loff_t old_i_size) · line 470
Quoted 5 lines
fs/ufs/truncate.c +1
-1@@ -467,7 +467,7 @@ int ufs_truncate(struct inode *inode, loff_t old_i_size)block_truncate_page (inode->i_mapping, inode->i_size, ufs_getfrag_block); -lock_kernel (); +lock_ufs ();
call lock again
Signature · 1 line
/Evgeniy
Arnd Bergmann
maintainerQuoted 11 lines · Evgeniy Dushistov
Quoted 10 lines · Arnd Bergmann
Quoted 8 lines · On Monday 22 November 2010 16:17:23 Nick Bowler wrote:
Quoted 5 lines · Linus Torvalds
Yes, I'd be ok with UDF doing a "select BKL" along with a "default n" for BKL itself.
I think UDF currently is the only sane reason to have BKL enabled any more, and yes, it would probably make it easier to configure things.
UFS (which I use) also relies on BKL.
Quoted 8 lines
Quoted 6 lines
Would you mind running a kernel with this patch and lockdep enabled then?
It's quite likely that this doesn't work, but the easiest way to find out is to just try it if you don't understand the code. I can't see anything in the code that relies on the release-on-sleep semantics and there are no obvious recursive
lock_kernel()calls.I see one without looking at code (am I missed something?). See below.
Right, that was rather obvious, thanks for taking a look!
Now that I have your attention, do you expect to be able to prepare a proper patch for 2.6.38? I don't have any experience with this file system, nor do I have useful ways of testing it, so that would be appreciated. Nick already volunteered to test patches, but I guess it would make more sense if you could do the patch.
Arnd
Quoted 9 lines · Arnd Bergmann
Right, that was rather obvious, thanks for taking a look!
Now that I have your attention, do you expect to be able to prepare a proper patch for 2.6.38? I don't have any experience with this file system, nor do I have useful ways of testing it, so that would be appreciated. Nick already volunteered to test patches, but I guess it would make more sense if you could do the patch.
Arnd
At now I am busy with my PhD thesis, but some time ago one person connected to me and say that he would like work on this problem, if I have no time.
So I wait patches from him, and if there are no such after a couple of months, I do it myself.
Signature · 1 line
/Evgeniy