llseek: automatically add .llseek fop

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

diff --git a/fs/coda/pioctl.c b/fs/coda/pioctl.c
index 127714936c666f5fc97e4d68927a68e3d0ae6726..028a9a0f588b2664cee7ab65a3a7f8ccc88af61c 100644 (file)
--- a/fs/coda/pioctl.c
+++ b/fs/coda/pioctl.c
@@ -1,6 +1,6 @@
 /*
  * Pioctl operations for Coda.
- * Original version: (C) 1996 Peter Braam 
+ * Original version: (C) 1996 Peter Braam
  * Rewritten for Linux 2.1: (C) 1997 Carnegie Mellon University
  *
  * Carnegie Mellon encourages users of this code to contribute improvements
@@ -23,73 +23,78 @@
 #include <linux/coda_fs_i.h>
 #include <linux/coda_psdev.h>
 
+#include <linux/smp_lock.h>
+
 /* pioctl ops */
-static int coda_ioctl_permission(struct inode *inode, int mask,
-                                struct nameidata *nd);
-static int coda_pioctl(struct inode * inode, struct file * filp, 
-                       unsigned int cmd, unsigned long user_data);
+static int coda_ioctl_permission(struct inode *inode, int mask);
+static long coda_pioctl(struct file *filp, unsigned int cmd,
+                       unsigned long user_data);
 
 /* exported from this file */
-struct inode_operations coda_ioctl_inode_operations =
-{
+const struct inode_operations coda_ioctl_inode_operations = {
        .permission     = coda_ioctl_permission,
        .setattr        = coda_setattr,
 };
 
-struct file_operations coda_ioctl_operations = {
+const struct file_operations coda_ioctl_operations = {
        .owner          = THIS_MODULE,
-       .ioctl          = coda_pioctl,
+       .unlocked_ioctl = coda_pioctl,
+       .llseek         = noop_llseek,
 };
 
 /* the coda pioctl inode ops */
-static int coda_ioctl_permission(struct inode *inode, int mask,
-                                struct nameidata *nd)
+static int coda_ioctl_permission(struct inode *inode, int mask)
 {
-        return 0;
+       return (mask & MAY_EXEC) ? -EACCES : 0;
 }
 
-static int coda_pioctl(struct inode * inode, struct file * filp, 
-                       unsigned int cmd, unsigned long user_data)
+static long coda_pioctl(struct file *filp, unsigned int cmd,
+                       unsigned long user_data)
 {
-       struct nameidata nd;
-        int error;
+       struct path path;
+       int error;
        struct PioctlData data;
-        struct inode *target_inode = NULL;
-        struct coda_inode_info *cnp;
+       struct inode *inode = filp->f_dentry->d_inode;
+       struct inode *target_inode = NULL;
+       struct coda_inode_info *cnp;
 
-        /* get the Pioctl data arguments from user space */
-        if (copy_from_user(&data, (void __user *)user_data, sizeof(data))) {
-           return -EINVAL;
-       }
-       
-        /* 
-         * Look up the pathname. Note that the pathname is in 
-         * user memory, and namei takes care of this
-         */
-        if ( data.follow ) {
-                error = user_path_walk(data.path, &nd);
-       } else {
-               error = user_path_walk_link(data.path, &nd);
-       }
-               
-       if ( error ) {
-               return error;
-        } else {
-               target_inode = nd.dentry->d_inode;
+       lock_kernel();
+
+       /* get the Pioctl data arguments from user space */
+       if (copy_from_user(&data, (void __user *)user_data, sizeof(data))) {
+               error = -EINVAL;
+               goto out;
        }
-       
+
+       /*
+        * Look up the pathname. Note that the pathname is in
+        * user memory, and namei takes care of this
+        */
+       if (data.follow)
+               error = user_path(data.path, &path);
+       else
+               error = user_lpath(data.path, &path);
+
+       if (error)
+               goto out;
+       else
+               target_inode = path.dentry->d_inode;
+
        /* return if it is not a Coda inode */
-       if ( target_inode->i_sb != inode->i_sb ) {
-               path_release(&nd);
-               return  -EINVAL;
+       if (target_inode->i_sb != inode->i_sb) {
+               path_put(&path);
+               error = -EINVAL;
+               goto out;
        }
 
        /* now proceed to make the upcall */
-        cnp = ITOC(target_inode);
+       cnp = ITOC(target_inode);
 
        error = venus_pioctl(inode->i_sb, &(cnp->c_fid), cmd, &data);
 
-       path_release(&nd);
-        return error;
-}
+       path_put(&path);
 
+out:
+       unlock_kernel();
+       return error;
+}