diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-10-05 01:18:40 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-10-05 01:18:40 +0000 |
| commit | 012bb3e61e5eced6c610f9e036372bf0c8def2d1 (patch) | |
| tree | 87efc733f9b164e8c85c0336f92c8fb7eff6d183 /fs/coda/pioctl.c | |
| parent | 625a1589d3d6464b5d90b8a0918789e3afffd220 (diff) | |
Merge with Linux 2.4.0-test9. Please check DECstation, I had a number
of rejects to fixup while integrating Linus patches. I also found
that this kernel will only boot SMP on Origin; the UP kernel freeze
soon after bootup with SCSI timeout messages. I commit this anyway
since I found that the last CVS versions had the same problem.
Diffstat (limited to 'fs/coda/pioctl.c')
| -rw-r--r-- | fs/coda/pioctl.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/coda/pioctl.c b/fs/coda/pioctl.c index 99ead4e51..6deeb927c 100644 --- a/fs/coda/pioctl.c +++ b/fs/coda/pioctl.c @@ -23,13 +23,12 @@ #include <linux/coda.h> #include <linux/coda_linux.h> #include <linux/coda_fs_i.h> -#include <linux/coda_cache.h> #include <linux/coda_psdev.h> /* pioctl ops */ static int coda_ioctl_permission(struct inode *inode, int mask); static int coda_pioctl(struct inode * inode, struct file * filp, - unsigned int cmd, unsigned long arg); + unsigned int cmd, unsigned long user_data); /* exported from this file */ struct inode_operations coda_ioctl_inode_operations = @@ -52,7 +51,7 @@ static int coda_ioctl_permission(struct inode *inode, int mask) } static int coda_pioctl(struct inode * inode, struct file * filp, - unsigned int cmd, unsigned long user_data) + unsigned int cmd, unsigned long user_data) { struct nameidata nd; int error; |