diff options
-rw-r--r-- | drivers/char/raw.c | 1 | ||||
-rw-r--r-- | fs/fcntl.c | 10 | ||||
-rw-r--r-- | include/linux/fs.h | 2 |
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: | |||
90 | blkdev_put(bdev, filp->f_mode); | 90 | blkdev_put(bdev, filp->f_mode); |
91 | out: | 91 | out: |
92 | mutex_unlock(&raw_mutex); | 92 | mutex_unlock(&raw_mutex); |
93 | unlock_kernel(); | ||
93 | return err; | 94 | return err; |
94 | } | 95 | } |
95 | 96 | ||
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 | |||
531 | if (!new) | 531 | if (!new) |
532 | return -ENOMEM; | 532 | return -ENOMEM; |
533 | } | 533 | } |
534 | |||
535 | /* | ||
536 | * We need to take f_lock first since it's not an IRQ-safe | ||
537 | * lock. | ||
538 | */ | ||
539 | spin_lock(&filp->f_lock); | ||
534 | write_lock_irq(&fasync_lock); | 540 | write_lock_irq(&fasync_lock); |
535 | for (fp = fapp; (fa = *fp) != NULL; fp = &fa->fa_next) { | 541 | for (fp = fapp; (fa = *fp) != NULL; fp = &fa->fa_next) { |
536 | if (fa->fa_file == filp) { | 542 | if (fa->fa_file == filp) { |
@@ -555,14 +561,12 @@ int fasync_helper(int fd, struct file * filp, int on, struct fasync_struct **fap | |||
555 | result = 1; | 561 | result = 1; |
556 | } | 562 | } |
557 | out: | 563 | out: |
558 | /* Fix up FASYNC bit while still holding fasync_lock */ | ||
559 | spin_lock(&filp->f_lock); | ||
560 | if (on) | 564 | if (on) |
561 | filp->f_flags |= FASYNC; | 565 | filp->f_flags |= FASYNC; |
562 | else | 566 | else |
563 | filp->f_flags &= ~FASYNC; | 567 | filp->f_flags &= ~FASYNC; |
564 | spin_unlock(&filp->f_lock); | ||
565 | write_unlock_irq(&fasync_lock); | 568 | write_unlock_irq(&fasync_lock); |
569 | spin_unlock(&filp->f_lock); | ||
566 | return result; | 570 | return result; |
567 | } | 571 | } |
568 | 572 | ||
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 { | |||
849 | #define f_dentry f_path.dentry | 849 | #define f_dentry f_path.dentry |
850 | #define f_vfsmnt f_path.mnt | 850 | #define f_vfsmnt f_path.mnt |
851 | const struct file_operations *f_op; | 851 | const struct file_operations *f_op; |
852 | spinlock_t f_lock; /* f_ep_links, f_flags */ | 852 | spinlock_t f_lock; /* f_ep_links, f_flags, no IRQ */ |
853 | atomic_long_t f_count; | 853 | atomic_long_t f_count; |
854 | unsigned int f_flags; | 854 | unsigned int f_flags; |
855 | fmode_t f_mode; | 855 | fmode_t f_mode; |