diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
| commit | d120cfb544ed6161b9d32fb6c4648c471807ee6b (patch) | |
| tree | 7757ad0198d8df76ff5c60f939a687687c41da00 /fs/nfs/file.c | |
| parent | 9dce0e950dbfab4148f35ac6f297d8638cdc63c4 (diff) | |
| parent | bf7e8511088963078484132636839b59e25cf14f (diff) | |
merge linus into release branch
Conflicts:
drivers/acpi/acpi_memhotplug.c
Diffstat (limited to 'fs/nfs/file.c')
| -rw-r--r-- | fs/nfs/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/file.c b/fs/nfs/file.c index add289138836..cc2b874ad5a4 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c | |||
| @@ -315,7 +315,7 @@ static int nfs_release_page(struct page *page, gfp_t gfp) | |||
| 315 | return !nfs_wb_page(page->mapping->host, page); | 315 | return !nfs_wb_page(page->mapping->host, page); |
| 316 | } | 316 | } |
| 317 | 317 | ||
| 318 | struct address_space_operations nfs_file_aops = { | 318 | const struct address_space_operations nfs_file_aops = { |
| 319 | .readpage = nfs_readpage, | 319 | .readpage = nfs_readpage, |
| 320 | .readpages = nfs_readpages, | 320 | .readpages = nfs_readpages, |
| 321 | .set_page_dirty = __set_page_dirty_nobuffers, | 321 | .set_page_dirty = __set_page_dirty_nobuffers, |