diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2010-04-27 16:24:24 +0200 |
|---|---|---|
| committer | Frederic Weisbecker <fweisbec@gmail.com> | 2010-05-17 05:27:04 +0200 |
| commit | 977183902a52d1e0adc986f9462424db5a545044 (patch) | |
| tree | 5e8b96c2736875a1e1f11f4beb941e2e68130013 /fs/coda | |
| parent | d5f1d54cbc1b2f320ac054b2df519dec22a27779 (diff) | |
| download | kernel_samsung_espresso10-977183902a52d1e0adc986f9462424db5a545044.zip kernel_samsung_espresso10-977183902a52d1e0adc986f9462424db5a545044.tar.gz kernel_samsung_espresso10-977183902a52d1e0adc986f9462424db5a545044.tar.bz2 | |
coda/psdev: Remove BKL from ioctl function
The ioctl function returns constant results, so it obviously
does not need the BKL and can be converted to unlocked_ioctl.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Diffstat (limited to 'fs/coda')
| -rw-r--r-- | fs/coda/psdev.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/coda/psdev.c b/fs/coda/psdev.c index be4392c..66b9cf7 100644 --- a/fs/coda/psdev.c +++ b/fs/coda/psdev.c @@ -73,8 +73,7 @@ static unsigned int coda_psdev_poll(struct file *file, poll_table * wait) return mask; } -static int coda_psdev_ioctl(struct inode * inode, struct file * filp, - unsigned int cmd, unsigned long arg) +static long coda_psdev_ioctl(struct file * filp, unsigned int cmd, unsigned long arg) { unsigned int data; @@ -344,7 +343,7 @@ static const struct file_operations coda_psdev_fops = { .read = coda_psdev_read, .write = coda_psdev_write, .poll = coda_psdev_poll, - .ioctl = coda_psdev_ioctl, + .unlocked_ioctl = coda_psdev_ioctl, .open = coda_psdev_open, .release = coda_psdev_release, }; |