diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-15 03:32:22 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-15 03:32:22 +0000 |
| commit | f1da2c3860e301527d56a1ef0b56c649ee7c4b1b (patch) | |
| tree | 562b5d2e8b9cb62eb983d78ff6bcf9789e08fcf6 /fs/coda/pioctl.c | |
| parent | 00f11569ac8ca73cbcdef8822de1583e79aee571 (diff) | |
Merge with Linux 2.4.0-test5-pre1. This works again on Origin UP.
The IP22 cache bugs which are plaguing some machines are still unfixed.
Diffstat (limited to 'fs/coda/pioctl.c')
| -rw-r--r-- | fs/coda/pioctl.c | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/fs/coda/pioctl.c b/fs/coda/pioctl.c index dd2636895..711beee06 100644 --- a/fs/coda/pioctl.c +++ b/fs/coda/pioctl.c @@ -16,6 +16,8 @@ #include <linux/locks.h> #include <asm/segment.h> #include <linux/string.h> +#define __NO_VERSION__ +#include <linux/module.h> #include <asm/uaccess.h> #include <linux/coda.h> @@ -26,8 +28,6 @@ /* pioctl ops */ static int coda_ioctl_permission(struct inode *inode, int mask); -static int coda_ioctl_open(struct inode *i, struct file *f); -static int coda_ioctl_release(struct inode *i, struct file *f); static int coda_pioctl(struct inode * inode, struct file * filp, unsigned int cmd, unsigned long arg); @@ -39,9 +39,8 @@ struct inode_operations coda_ioctl_inode_operations = }; struct file_operations coda_ioctl_operations = { + owner: THIS_MODULE, ioctl: coda_pioctl, - open: coda_ioctl_open, - release: coda_ioctl_release, }; /* the coda pioctl inode ops */ @@ -52,24 +51,6 @@ static int coda_ioctl_permission(struct inode *inode, int mask) return 0; } -/* The pioctl file ops*/ -int coda_ioctl_open(struct inode *i, struct file *f) -{ - ENTRY; - - CDEBUG(D_PIOCTL, "File inode number: %ld\n", - f->f_dentry->d_inode->i_ino); - - EXIT; - return 0; -} - -int coda_ioctl_release(struct inode *i, struct file *f) -{ - return 0; -} - - static int coda_pioctl(struct inode * inode, struct file * filp, unsigned int cmd, unsigned long user_data) { |