diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2010-08-26 19:22:27 +0200 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2010-08-26 19:22:27 +0200 |
| commit | f632265d0ffb5acf331252d98c64939849d96bb2 (patch) | |
| tree | 31187d9a726bf1ca6ca12e26ad8e7c609eaf4d8b /fs/bad_inode.c | |
| parent | nfsd4: fix downgrade/lock logic (diff) | |
| parent | Linux 2.6.36-rc1 (diff) | |
| download | linux-f632265d0ffb5acf331252d98c64939849d96bb2.tar.xz linux-f632265d0ffb5acf331252d98c64939849d96bb2.zip | |
Merge commit 'v2.6.36-rc1' into HEAD
Diffstat (limited to 'fs/bad_inode.c')
| -rw-r--r-- | fs/bad_inode.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/fs/bad_inode.c b/fs/bad_inode.c index 52e59bf4aa5f..f024d8aaddef 100644 --- a/fs/bad_inode.c +++ b/fs/bad_inode.c @@ -55,12 +55,6 @@ static unsigned int bad_file_poll(struct file *filp, poll_table *wait) return POLLERR; } -static int bad_file_ioctl (struct inode *inode, struct file *filp, - unsigned int cmd, unsigned long arg) -{ - return -EIO; -} - static long bad_file_unlocked_ioctl(struct file *file, unsigned cmd, unsigned long arg) { @@ -159,7 +153,6 @@ static const struct file_operations bad_file_ops = .aio_write = bad_file_aio_write, .readdir = bad_file_readdir, .poll = bad_file_poll, - .ioctl = bad_file_ioctl, .unlocked_ioctl = bad_file_unlocked_ioctl, .compat_ioctl = bad_file_compat_ioctl, .mmap = bad_file_mmap, |