diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-17 21:51:42 -0500 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-17 21:51:42 -0500 |
| commit | c58310bf4933986513020fa90b4190c7492995ae (patch) | |
| tree | 143f2c7578d02ebef5db8fc57ae69e951ae0e2ee /fs/9p/vfs_file.c | |
| parent | 269cdfaf769f5cd831284cc831790c7c5038040f (diff) | |
| parent | 1309d4e68497184d2fd87e892ddf14076c2bda98 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'fs/9p/vfs_file.c')
| -rw-r--r-- | fs/9p/vfs_file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c index ba4b1caa9c43..a616fff8906d 100644 --- a/fs/9p/vfs_file.c +++ b/fs/9p/vfs_file.c | |||
| @@ -184,7 +184,7 @@ static const struct file_operations v9fs_cached_file_operations = { | |||
| 184 | .open = v9fs_file_open, | 184 | .open = v9fs_file_open, |
| 185 | .release = v9fs_dir_release, | 185 | .release = v9fs_dir_release, |
| 186 | .lock = v9fs_file_lock, | 186 | .lock = v9fs_file_lock, |
| 187 | .mmap = generic_file_mmap, | 187 | .mmap = generic_file_readonly_mmap, |
| 188 | }; | 188 | }; |
| 189 | 189 | ||
| 190 | const struct file_operations v9fs_file_operations = { | 190 | const struct file_operations v9fs_file_operations = { |
| @@ -194,5 +194,5 @@ const struct file_operations v9fs_file_operations = { | |||
| 194 | .open = v9fs_file_open, | 194 | .open = v9fs_file_open, |
| 195 | .release = v9fs_dir_release, | 195 | .release = v9fs_dir_release, |
| 196 | .lock = v9fs_file_lock, | 196 | .lock = v9fs_file_lock, |
| 197 | .mmap = generic_file_mmap, | 197 | .mmap = generic_file_readonly_mmap, |
| 198 | }; | 198 | }; |