Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6

* 'bkl-removal' of git://git.lwn.net/linux-2.6: (146 commits)
  IB/umad: BKL is not needed for ib_umad_open()
  IB/uverbs: BKL is not needed for ib_uverbs_open()
  bf561-coreb: BKL unneeded for open()
  Call fasync() functions without the BKL
  snd/PCM: fasync BKL pushdown
  ipmi: fasync BKL pushdown
  ecryptfs: fasync BKL pushdown
  Bluetooth VHCI: fasync BKL pushdown
  tty_io: fasync BKL pushdown
  tun: fasync BKL pushdown
  i2o: fasync BKL pushdown
  mpt: fasync BKL pushdown
  Remove BKL from remote_llseek v2
  Make FAT users happier by not deadlocking
  x86-mce: BKL pushdown
  vmwatchdog: BKL pushdown
  vmcp: BKL pushdown
  via-pmu: BKL pushdown
  uml-random: BKL pushdown
  uml-mmapper: BKL pushdown
  ...

10 files changed, 67 insertions, 15 deletions

diff --git a/drivers/s390/block/dasd_eer.c b/drivers/s390/block/dasd_eer.c
index 6e53ab606e97..29da4413ad43 100644
--- a/drivers/s390/block/dasd_eer.c
+++ b/drivers/s390/block/dasd_eer.c
@@ -15,6 +15,7 @@
 #include <linux/device.h>
 #include <linux/poll.h>
 #include <linux/mutex.h>
+#include <linux/smp_lock.h>
 
 #include <asm/uaccess.h>
 #include <asm/atomic.h>
@@ -525,6 +526,7 @@ static int dasd_eer_open(struct inode *inp, struct file *filp)
         eerb = kzalloc(sizeof(struct eerbuffer), GFP_KERNEL);
         if (!eerb)
                 return -ENOMEM;
+        lock_kernel();
         eerb->buffer_page_count = eer_pages;
         if (eerb->buffer_page_count < 1 ||
             eerb->buffer_page_count > INT_MAX / PAGE_SIZE) {
@@ -532,6 +534,7 @@ static int dasd_eer_open(struct inode *inp, struct file *filp)
                 MESSAGE(KERN_WARNING, "can't open device since module "
                         "parameter eer_pages is smaller then 1 or"
                         " bigger then %d", (int)(INT_MAX / PAGE_SIZE));
+                unlock_kernel();
                 return -EINVAL;
         }
         eerb->buffersize = eerb->buffer_page_count * PAGE_SIZE;
@@ -539,12 +542,14 @@ static int dasd_eer_open(struct inode *inp, struct file *filp)
                                GFP_KERNEL);
         if (!eerb->buffer) {
                 kfree(eerb);
+                unlock_kernel();
                 return -ENOMEM;
         }
         if (dasd_eer_allocate_buffer_pages(eerb->buffer,
                                            eerb->buffer_page_count)) {
                 kfree(eerb->buffer);
                 kfree(eerb);
+                unlock_kernel();
                 return -ENOMEM;
         }
         filp->private_data = eerb;
@@ -552,6 +557,7 @@ static int dasd_eer_open(struct inode *inp, struct file *filp)
         list_add(&eerb->list, &bufferlist);
         spin_unlock_irqrestore(&bufferlock, flags);
 
+        unlock_kernel();
         return nonseekable_open(inp,filp);
 }
 
diff --git a/drivers/s390/char/fs3270.c b/drivers/s390/char/fs3270.c
index e136d10a0de6..d18e6d2e0b49 100644
--- a/drivers/s390/char/fs3270.c
+++ b/drivers/s390/char/fs3270.c
@@ -14,6 +14,7 @@
 #include <linux/interrupt.h>
 #include <linux/list.h>
 #include <linux/types.h>
+#include <linux/smp_lock.h>
 
 #include <asm/ccwdev.h>
 #include <asm/cio.h>
@@ -421,6 +422,7 @@ fs3270_open(struct inode *inode, struct file *filp)
 
         if (imajor(filp->f_path.dentry->d_inode) != IBM_FS3270_MAJOR)
                 return -ENODEV;
+        lock_kernel();
         minor = iminor(filp->f_path.dentry->d_inode);
         /* Check for minor 0 multiplexer. */
         if (minor == 0) {
@@ -429,7 +431,8 @@ fs3270_open(struct inode *inode, struct file *filp)
                 tty = get_current_tty();
                 if (!tty || tty->driver->major != IBM_TTY3270_MAJOR) {
                         mutex_unlock(&tty_mutex);
-                        return -ENODEV;
+                        rc = -ENODEV;
+                        goto out;
                 }
                 minor = tty->index + RAW3270_FIRSTMINOR;
                 mutex_unlock(&tty_mutex);
@@ -438,19 +441,22 @@ fs3270_open(struct inode *inode, struct file *filp)
         fp = (struct fs3270 *) raw3270_find_view(&fs3270_fn, minor);
         if (!IS_ERR(fp)) {
                 raw3270_put_view(&fp->view);
-                return -EBUSY;
+                rc = -EBUSY;
+                goto out;
         }
         /* Allocate fullscreen view structure. */
         fp = fs3270_alloc_view();
-        if (IS_ERR(fp))
-                return PTR_ERR(fp);
+        if (IS_ERR(fp)) {
+                rc = PTR_ERR(fp);
+                goto out;
+        }
 
         init_waitqueue_head(&fp->wait);
         fp->fs_pid = get_pid(task_pid(current));
         rc = raw3270_add_view(&fp->view, &fs3270_fn, minor);
         if (rc) {
                 fs3270_free_view(&fp->view);
-                return rc;
+                goto out;
         }
 
         /* Allocate idal-buffer. */
@@ -458,7 +464,8 @@ fs3270_open(struct inode *inode, struct file *filp)
         if (IS_ERR(ib)) {
                 raw3270_put_view(&fp->view);
                 raw3270_del_view(&fp->view);
-                return PTR_ERR(fp);
+                rc = PTR_ERR(fp);
+                goto out;
         }
         fp->rdbuf = ib;
 
@@ -466,9 +473,11 @@ fs3270_open(struct inode *inode, struct file *filp)
         if (rc) {
                 raw3270_put_view(&fp->view);
                 raw3270_del_view(&fp->view);
-                return rc;
+                goto out;
         }
         filp->private_data = fp;
+out:
+        unlock_kernel();
         return 0;
 }
 
diff --git a/drivers/s390/char/monreader.c b/drivers/s390/char/monreader.c
index f0e4c96afbf8..35fd8dfcaaa6 100644
--- a/drivers/s390/char/monreader.c
+++ b/drivers/s390/char/monreader.c
@@ -10,6 +10,7 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/init.h>
+#include <linux/smp_lock.h>
 #include <linux/errno.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
@@ -291,6 +292,7 @@ static int mon_open(struct inode *inode, struct file *filp)
         /*
          * only one user allowed
          */
+        lock_kernel();
         rc = -EBUSY;
         if (test_and_set_bit(MON_IN_USE, &mon_in_use))
                 goto out;
@@ -327,6 +329,7 @@ static int mon_open(struct inode *inode, struct file *filp)
                 goto out_path;
         }
         filp->private_data = monpriv;
+        unlock_kernel();
         return nonseekable_open(inode, filp);
 
 out_path:
@@ -336,6 +339,7 @@ out_priv:
 out_use:
         clear_bit(MON_IN_USE, &mon_in_use);
 out:
+        unlock_kernel();
         return rc;
 }
 
diff --git a/drivers/s390/char/monwriter.c b/drivers/s390/char/monwriter.c
index a86c0534cd49..4d71aa8c1a79 100644
--- a/drivers/s390/char/monwriter.c
+++ b/drivers/s390/char/monwriter.c
@@ -12,6 +12,7 @@
 #include <linux/moduleparam.h>
 #include <linux/init.h>
 #include <linux/errno.h>
+#include <linux/smp_lock.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/miscdevice.h>
@@ -179,10 +180,12 @@ static int monwrite_open(struct inode *inode, struct file *filp)
         monpriv = kzalloc(sizeof(struct mon_private), GFP_KERNEL);
         if (!monpriv)
                 return -ENOMEM;
+        lock_kernel();
         INIT_LIST_HEAD(&monpriv->list);
         monpriv->hdr_to_read = sizeof(monpriv->hdr);
         mutex_init(&monpriv->thread_mutex);
         filp->private_data = monpriv;
+        unlock_kernel();
         return nonseekable_open(inode, filp);
 }
 
diff --git a/drivers/s390/char/tape_char.c b/drivers/s390/char/tape_char.c
index ebe84067bae9..687720b552d1 100644
--- a/drivers/s390/char/tape_char.c
+++ b/drivers/s390/char/tape_char.c
@@ -14,6 +14,7 @@
 #include <linux/types.h>
 #include <linux/proc_fs.h>
 #include <linux/mtio.h>
+#include <linux/smp_lock.h>
 
 #include <asm/uaccess.h>
 
@@ -289,21 +290,26 @@ tapechar_open (struct inode *inode, struct file *filp)
         if (imajor(filp->f_path.dentry->d_inode) != tapechar_major)
                 return -ENODEV;
 
+        lock_kernel();
         minor = iminor(filp->f_path.dentry->d_inode);
         device = tape_get_device(minor / TAPE_MINORS_PER_DEV);
         if (IS_ERR(device)) {
                 DBF_EVENT(3, "TCHAR:open: tape_get_device() failed\n");
-                return PTR_ERR(device);
+                rc = PTR_ERR(device);
+                goto out;
         }
 
 
         rc = tape_open(device);
         if (rc == 0) {
                 filp->private_data = device;
-                return nonseekable_open(inode, filp);
+                rc = nonseekable_open(inode, filp);
         }
-        tape_put_device(device);
+        else
+                tape_put_device(device);
 
+out:
+        unlock_kernel();
         return rc;
 }
 
diff --git a/drivers/s390/char/vmcp.c b/drivers/s390/char/vmcp.c
index 401ea84b3059..09e7d9bf438b 100644
--- a/drivers/s390/char/vmcp.c
+++ b/drivers/s390/char/vmcp.c
@@ -16,6 +16,7 @@
 #include <linux/kernel.h>
 #include <linux/miscdevice.h>
 #include <linux/module.h>
+#include <linux/smp_lock.h>
 #include <asm/cpcmd.h>
 #include <asm/debug.h>
 #include <asm/uaccess.h>
@@ -39,11 +40,14 @@ static int vmcp_open(struct inode *inode, struct file *file)
         session = kmalloc(sizeof(*session), GFP_KERNEL);
         if (!session)
                 return -ENOMEM;
+
+        lock_kernel();
         session->bufsize = PAGE_SIZE;
         session->response = NULL;
         session->resp_size = 0;
         mutex_init(&session->mutex);
         file->private_data = session;
+        unlock_kernel();
         return nonseekable_open(inode, file);
 }
 
diff --git a/drivers/s390/char/vmlogrdr.c b/drivers/s390/char/vmlogrdr.c
index a246bc73ae64..c31faefa2b3b 100644
--- a/drivers/s390/char/vmlogrdr.c
+++ b/drivers/s390/char/vmlogrdr.c
@@ -25,6 +25,7 @@
 #include <linux/kmod.h>
 #include <linux/cdev.h>
 #include <linux/device.h>
+#include <linux/smp_lock.h>
 #include <linux/string.h>
 
 
@@ -310,9 +311,11 @@ static int vmlogrdr_open (struct inode *inode, struct file *filp)
                 return -ENOSYS;
 
         /* Besure this device hasn't already been opened */
+        lock_kernel();
         spin_lock_bh(&logptr->priv_lock);
         if (logptr->dev_in_use) {
                 spin_unlock_bh(&logptr->priv_lock);
+                unlock_kernel();
                 return -EBUSY;
         }
         logptr->dev_in_use = 1;
@@ -356,7 +359,9 @@ static int vmlogrdr_open (struct inode *inode, struct file *filp)
                    || (logptr->iucv_path_severed));
         if (logptr->iucv_path_severed)
                 goto out_record;
-        return nonseekable_open(inode, filp);
+        ret = nonseekable_open(inode, filp);
+        unlock_kernel();
+        return ret;
 
 out_record:
         if (logptr->autorecording)
@@ -366,6 +371,7 @@ out_path:
         logptr->path = NULL;
 out_dev:
         logptr->dev_in_use = 0;
+        unlock_kernel();
         return -EIO;
 }
 
diff --git a/drivers/s390/char/vmur.c b/drivers/s390/char/vmur.c
index 49cba9effe89..0a9f1cccbe58 100644
--- a/drivers/s390/char/vmur.c
+++ b/drivers/s390/char/vmur.c
@@ -9,6 +9,7 @@
  */
 
 #include <linux/cdev.h>
+#include <linux/smp_lock.h>
 
 #include <asm/uaccess.h>
 #include <asm/cio.h>
@@ -669,7 +670,7 @@ static int ur_open(struct inode *inode, struct file *file)
 
         if (accmode == O_RDWR)
                 return -EACCES;
-
+        lock_kernel();
         /*
          * We treat the minor number as the devno of the ur device
          * to find in the driver tree.
@@ -677,8 +678,10 @@ static int ur_open(struct inode *inode, struct file *file)
         devno = MINOR(file->f_dentry->d_inode->i_rdev);
 
         urd = urdev_get_from_devno(devno);
-        if (!urd)
-                return -ENXIO;
+        if (!urd) {
+                rc = -ENXIO;
+                goto out;
+        }
 
         spin_lock(&urd->open_lock);
         while (urd->open_flag) {
@@ -721,6 +724,7 @@ static int ur_open(struct inode *inode, struct file *file)
                 goto fail_urfile_free;
         urf->file_reclen = rc;
         file->private_data = urf;
+        unlock_kernel();
         return 0;
 
 fail_urfile_free:
@@ -731,6 +735,8 @@ fail_unlock:
         spin_unlock(&urd->open_lock);
 fail_put:
         urdev_put(urd);
+out:
+        unlock_kernel();
         return rc;
 }
 
diff --git a/drivers/s390/char/vmwatchdog.c b/drivers/s390/char/vmwatchdog.c
index 56b3eab019cb..21a2a829bf4e 100644
--- a/drivers/s390/char/vmwatchdog.c
+++ b/drivers/s390/char/vmwatchdog.c
@@ -13,6 +13,7 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/watchdog.h>
+#include <linux/smp_lock.h>
 
 #include <asm/ebcdic.h>
 #include <asm/io.h>
@@ -121,11 +122,15 @@ static int __init vmwdt_probe(void)
 static int vmwdt_open(struct inode *i, struct file *f)
 {
         int ret;
-        if (test_and_set_bit(0, &vmwdt_is_open))
+        lock_kernel();
+        if (test_and_set_bit(0, &vmwdt_is_open)) {
+                unlock_kernel();
                 return -EBUSY;
+        }
         ret = vmwdt_keepalive();
         if (ret)
                 clear_bit(0, &vmwdt_is_open);
+        unlock_kernel();
         return ret ? ret : nonseekable_open(i, f);
 }
 
diff --git a/drivers/s390/crypto/zcrypt_api.c b/drivers/s390/crypto/zcrypt_api.c
index 8a4964f3584b..cb22b97944b8 100644
--- a/drivers/s390/crypto/zcrypt_api.c
+++ b/drivers/s390/crypto/zcrypt_api.c
@@ -34,6 +34,7 @@
 #include <linux/fs.h>
 #include <linux/proc_fs.h>
 #include <linux/compat.h>
+#include <linux/smp_lock.h>
 #include <asm/atomic.h>
 #include <asm/uaccess.h>
 #include <linux/hw_random.h>
@@ -300,7 +301,9 @@ static ssize_t zcrypt_write(struct file *filp, const char __user *buf,
  */
 static int zcrypt_open(struct inode *inode, struct file *filp)
 {
+        lock_kernel();
         atomic_inc(&zcrypt_open_count);
+        unlock_kernel();
         return 0;
 }