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/write.c | |
| parent | 9dce0e950dbfab4148f35ac6f297d8638cdc63c4 (diff) | |
| parent | bf7e8511088963078484132636839b59e25cf14f (diff) | |
merge linus into release branch
Conflicts:
drivers/acpi/acpi_memhotplug.c
Diffstat (limited to 'fs/nfs/write.c')
| -rw-r--r-- | fs/nfs/write.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/write.c b/fs/nfs/write.c index b383fdd3a15c..8fccb9cb173b 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c | |||
| @@ -1551,7 +1551,7 @@ int __init nfs_init_writepagecache(void) | |||
| 1551 | return 0; | 1551 | return 0; |
| 1552 | } | 1552 | } |
| 1553 | 1553 | ||
| 1554 | void __exit nfs_destroy_writepagecache(void) | 1554 | void nfs_destroy_writepagecache(void) |
| 1555 | { | 1555 | { |
| 1556 | mempool_destroy(nfs_commit_mempool); | 1556 | mempool_destroy(nfs_commit_mempool); |
| 1557 | mempool_destroy(nfs_wdata_mempool); | 1557 | mempool_destroy(nfs_wdata_mempool); |