[Click] [PATCH 2/5] clickfs: use unlocked_ioctl on linux 2.6.36+

Joonwoo Park joonwpark81 at gmail.com
Sun Jan 30 04:18:58 EST 2011


As of linux 2.6.36 file_operations.ioctl has removed.

Signed-off-by: Joonwoo Park <joonwpark81 at gmail.com>
---
 linuxmodule/clickfs.cc |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/linuxmodule/clickfs.cc b/linuxmodule/clickfs.cc
index 123e143..59db23c 100644
--- a/linuxmodule/clickfs.cc
+++ b/linuxmodule/clickfs.cc
@@ -961,7 +961,11 @@ init_clickfs()
 
     click_handler_file_ops->read = handler_read;
     click_handler_file_ops->write = handler_write;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36)
+    click_handler_file_ops->unlocked_ioctl = handler_ioctl;
+#else
     click_handler_file_ops->ioctl = handler_ioctl;
+#endif
     click_handler_file_ops->open = handler_open;
     click_handler_file_ops->flush = handler_flush;
     click_handler_file_ops->release = handler_release;
-- 
1.7.1
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0002-clickfs-use-unlocked_ioctl-on-linux-2.6.36.patch
Type: text/x-diff
Size: 1056 bytes
Desc: not available
Url : http://amsterdam.lcs.mit.edu/pipermail/click/attachments/20110130/012fa519/attachment.patch 


More information about the click mailing list