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

* 'bkl-removal' of git://git.lwn.net/linux-2.6:
  Fix a lockdep warning in fasync_helper()
  Add a missing unlock_kernel() in raw_open()

3 files changed, 9 insertions, 4 deletions

diff --git a/drivers/char/raw.c b/drivers/char/raw.c
index 96adf28a17e4..20d90e6a6e50 100644
--- a/drivers/char/raw.c
+++ b/drivers/char/raw.c
@@ -90,6 +90,7 @@ out1:
         blkdev_put(bdev, filp->f_mode);
 out:
         mutex_unlock(&raw_mutex);
+        unlock_kernel();
         return err;
 }
 
diff --git a/fs/fcntl.c b/fs/fcntl.c
index d865ca66ccba..cc8e4de2fee5 100644
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
@@ -531,6 +531,12 @@ int fasync_helper(int fd, struct file * filp, int on, struct fasync_struct **fap
                 if (!new)
                         return -ENOMEM;
         }
+
+        /*
+         * We need to take f_lock first since it's not an IRQ-safe
+         * lock.
+         */
+        spin_lock(&filp->f_lock);
         write_lock_irq(&fasync_lock);
         for (fp = fapp; (fa = *fp) != NULL; fp = &fa->fa_next) {
                 if (fa->fa_file == filp) {
@@ -555,14 +561,12 @@ int fasync_helper(int fd, struct file * filp, int on, struct fasync_struct **fap
                 result = 1;
         }
 out:
-        /* Fix up FASYNC bit while still holding fasync_lock */
-        spin_lock(&filp->f_lock);
         if (on)
                 filp->f_flags |= FASYNC;
         else
                 filp->f_flags &= ~FASYNC;
-        spin_unlock(&filp->f_lock);
         write_unlock_irq(&fasync_lock);
+        spin_unlock(&filp->f_lock);
         return result;
 }
 
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 42436ae42f70..87e7bfc5ebd7 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -849,7 +849,7 @@ struct file {
 #define f_dentry        f_path.dentry
 #define f_vfsmnt        f_path.mnt
         const struct file_operations    *f_op;
-        spinlock_t              f_lock;  /* f_ep_links, f_flags */
+        spinlock_t              f_lock;  /* f_ep_links, f_flags, no IRQ */
         atomic_long_t           f_count;
         unsigned int            f_flags;
         fmode_t                 f_mode;