summaryrefslogtreecommitdiffstats
path: root/fs/ncpfs/file.c
diff options
context:
space:
mode:
authorJohn Kacur <jkacur@redhat.com>2010-05-05 15:15:37 +0200
committerFrederic Weisbecker <fweisbec@gmail.com>2010-05-17 05:27:42 +0200
commit93d84b6d99f5ddb911b318990c759a0fefa0f7ea (patch)
tree5fab098d57799d8889b0e419a5cd411d318a6b14 /fs/ncpfs/file.c
parentcoda: Clean-up whitespace problems in pioctl.c (diff)
downloadlinux-93d84b6d99f5ddb911b318990c759a0fefa0f7ea.tar.xz
linux-93d84b6d99f5ddb911b318990c759a0fefa0f7ea.zip
ncpfs: BKL ioctl pushdown
Convert ncp_ioctl to an unlocked_ioctl and push down the bkl into it. Signed-off-by: John Kacur <jkacur@redhat.com> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@elte.hu> Cc: Petr Vandrovec <vandrove@vc.cvut.cz> Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Diffstat (limited to 'fs/ncpfs/file.c')
-rw-r--r--fs/ncpfs/file.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ncpfs/file.c b/fs/ncpfs/file.c
index 1daabb90e0a5..b93870892892 100644
--- a/fs/ncpfs/file.c
+++ b/fs/ncpfs/file.c
@@ -295,7 +295,7 @@ const struct file_operations ncp_file_operations =
.llseek = ncp_remote_llseek,
.read = ncp_file_read,
.write = ncp_file_write,
- .ioctl = ncp_ioctl,
+ .unlocked_ioctl = ncp_ioctl,
#ifdef CONFIG_COMPAT
.compat_ioctl = ncp_compat_ioctl,
#endif