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

[Bobby Longpocket]

Hi Joonwoo,

This patch doesn't look right.  The arguments for the unlocked_ioctl() interface are different than those for the old ioctl() interface.



--- On Sun, 1/30/11, click-request at pdos.csail.mit.edu <click-request at pdos.csail.mit.edu> wrote:
> Message: 2
> Date: Sun, 30 Jan 2011 01:18:58 -0800
> From: Joonwoo Park <joonwpark81 at gmail.com>
> Subject: [Click]  [PATCH 2/5] clickfs: use
> unlocked_ioctl on linux
>     2.6.36+
> To: Eddie Kohler <kohler at cs.ucla.edu>
> Cc: click at pdos.csail.mit.edu
> Message-ID: <20110130091858.GB25293 at gm>
> Content-Type: text/plain; charset="us-ascii"
> 
> 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
>