diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-01-19 14:26:05 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-01-19 14:26:05 +1100 |
| commit | 10ddaf2c090a038ab048ddb89bc93fafe7e3e9af (patch) | |
| tree | a0917c85785299c0b648b19dd98e0fc78e4c5ecb /drivers/char | |
| parent | aae96e9811371c2a350d2c9355a340c4e4210720 (diff) | |
| parent | 7232c910b7bcf86e8985f7029bba2f0a80d31df3 (diff) | |
Merge commit 'bkl-removal/bkl-removal'
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/tty_io.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c index d33e5ab06177..84503163a143 100644 --- a/drivers/char/tty_io.c +++ b/drivers/char/tty_io.c @@ -2160,13 +2160,12 @@ static int fionbio(struct file *file, int __user *p) if (get_user(nonblock, p)) return -EFAULT; - /* file->f_flags is still BKL protected in the fs layer - vomit */ - lock_kernel(); + lock_file_flags(); if (nonblock) file->f_flags |= O_NONBLOCK; else file->f_flags &= ~O_NONBLOCK; - unlock_kernel(); + unlock_file_flags(); return 0; } |