Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
* '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()
This commit is contained in:
Linus Torvalds 2009-03-30 11:31:47 -07:00
commit 2d25ee36c8
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/char/raw.c
View file

@ -90,6 +90,7 @@ static int raw_open(struct inode *inode, struct file *filp)
blkdev_put(bdev, filp->f_mode); blkdev_put(bdev, filp->f_mode);
out: out:
mutex_unlock(&raw_mutex); mutex_unlock(&raw_mutex);
unlock_kernel();
return err; return err;
} }

10
fs/fcntl.c
View file

@ -531,6 +531,12 @@ int fasync_helper(int fd, struct file * filp, int on, struct fasync_struct **fap
if (!new) if (!new)
return -ENOMEM; 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); write_lock_irq(&fasync_lock);
for (fp = fapp; (fa = *fp) != NULL; fp = &fa->fa_next) { for (fp = fapp; (fa = *fp) != NULL; fp = &fa->fa_next) {
if (fa->fa_file == filp) { 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; result = 1;
} }
out: out:
/* Fix up FASYNC bit while still holding fasync_lock */
spin_lock(&filp->f_lock);
if (on) if (on)
filp->f_flags |= FASYNC; filp->f_flags |= FASYNC;
else else
filp->f_flags &= ~FASYNC; filp->f_flags &= ~FASYNC;
spin_unlock(&filp->f_lock);
write_unlock_irq(&fasync_lock); write_unlock_irq(&fasync_lock);
spin_unlock(&filp->f_lock);
return result; return result;
} }

2
include/linux/fs.h
View file

@ -849,7 +849,7 @@ struct file {
#define f_dentry f_path.dentry #define f_dentry f_path.dentry
#define f_vfsmnt f_path.mnt #define f_vfsmnt f_path.mnt
const struct file_operations *f_op; 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; atomic_long_t f_count;
unsigned int f_flags; unsigned int f_flags;
fmode_t f_mode; fmode_t f_mode;