As of linux 2.6.36 file_operations.ioctl has removed.

Signed-off-by: Joonwoo Park <[email protected]>
---
 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
>From ee4af350ee541ca42c0825453ce20947fcbec1be Mon Sep 17 00:00:00 2001
From: Joonwoo Park <[email protected]>
Date: Sun, 30 Jan 2011 00:11:36 -0800
Subject: [PATCH 2/5] clickfs: use unlocked_ioctl on linux 2.6.36+

As of linux 2.6.36 file_operations.ioctl has removed.

Signed-off-by: Joonwoo Park <[email protected]>
---
 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

_______________________________________________
click mailing list
[email protected]
https://amsterdam.lcs.mit.edu/mailman/listinfo/click

Reply via email to