diff options
| author | Sage Weil <sage@inktank.com> | 2013-08-15 14:11:45 -0400 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-08-15 14:11:45 -0400 |
| commit | ee3e542fec6e69bc9fb668698889a37d93950ddf (patch) | |
| tree | e74ee766a4764769ef1d3d45d266b4dea64101d3 /fs/bad_inode.c | |
| parent | fe2a801b50c0bb8039d627e5ae1fec249d10ff39 (diff) | |
| parent | f1d6e17f540af37bb1891480143669ba7636c4cf (diff) | |
Merge remote-tracking branch 'linus/master' into testing
Diffstat (limited to 'fs/bad_inode.c')
| -rw-r--r-- | fs/bad_inode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/bad_inode.c b/fs/bad_inode.c index 922ad460bff9..7c93953030fb 100644 --- a/fs/bad_inode.c +++ b/fs/bad_inode.c | |||
| @@ -45,7 +45,7 @@ static ssize_t bad_file_aio_write(struct kiocb *iocb, const struct iovec *iov, | |||
| 45 | return -EIO; | 45 | return -EIO; |
| 46 | } | 46 | } |
| 47 | 47 | ||
| 48 | static int bad_file_readdir(struct file *filp, void *dirent, filldir_t filldir) | 48 | static int bad_file_readdir(struct file *file, struct dir_context *ctx) |
| 49 | { | 49 | { |
| 50 | return -EIO; | 50 | return -EIO; |
| 51 | } | 51 | } |
| @@ -152,7 +152,7 @@ static const struct file_operations bad_file_ops = | |||
| 152 | .write = bad_file_write, | 152 | .write = bad_file_write, |
| 153 | .aio_read = bad_file_aio_read, | 153 | .aio_read = bad_file_aio_read, |
| 154 | .aio_write = bad_file_aio_write, | 154 | .aio_write = bad_file_aio_write, |
| 155 | .readdir = bad_file_readdir, | 155 | .iterate = bad_file_readdir, |
| 156 | .poll = bad_file_poll, | 156 | .poll = bad_file_poll, |
| 157 | .unlocked_ioctl = bad_file_unlocked_ioctl, | 157 | .unlocked_ioctl = bad_file_unlocked_ioctl, |
| 158 | .compat_ioctl = bad_file_compat_ioctl, | 158 | .compat_ioctl = bad_file_compat_ioctl, |