fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / fs / coda / pioctl.c

diff --git a/fs/coda/pioctl.c b/fs/coda/pioctl.c
index e10ac76..214822b 100644 (file)
--- a/fs/coda/pioctl.c
+++ b/fs/coda/pioctl.c
@@ -36,7 +36,7 @@ struct inode_operations coda_ioctl_inode_operations =
        .setattr        = coda_setattr,
 };
 
-struct file_operations coda_ioctl_operations = {
+const struct file_operations coda_ioctl_operations = {
        .owner          = THIS_MODULE,
        .ioctl          = coda_pioctl,
 };
@@ -58,7 +58,7 @@ static int coda_pioctl(struct inode * inode, struct file * filp,
         struct coda_inode_info *cnp;
 
         /* get the Pioctl data arguments from user space */
-        if (copy_from_user(&data, (int *)user_data, sizeof(data))) {
+        if (copy_from_user(&data, (void __user *)user_data, sizeof(data))) {
            return -EINVAL;
        }