diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-15 10:27:06 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-15 10:27:06 -0400 |
| commit | 2d3b5fa3a39d16c880bda3cf2bd9dd6ed5a01f74 (patch) | |
| tree | e20283fe2ed46aa35c8ca5fc1724ba067cd2e2f8 /fs/nilfs2/page.c | |
| parent | 3f17522ce461a31e7ced6311b28fcf5b8a763316 (diff) | |
| parent | 7278a22143b003e9af7b9ca1b5f1c40ae4b55d98 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6
Diffstat (limited to 'fs/nilfs2/page.c')
| -rw-r--r-- | fs/nilfs2/page.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nilfs2/page.c b/fs/nilfs2/page.c index a2692bbc7b50..fc246dba112a 100644 --- a/fs/nilfs2/page.c +++ b/fs/nilfs2/page.c | |||
| @@ -292,7 +292,7 @@ void nilfs_free_private_page(struct page *page) | |||
| 292 | * @src: source page | 292 | * @src: source page |
| 293 | * @copy_dirty: flag whether to copy dirty states on the page's buffer heads. | 293 | * @copy_dirty: flag whether to copy dirty states on the page's buffer heads. |
| 294 | * | 294 | * |
| 295 | * This fuction is for both data pages and btnode pages. The dirty flag | 295 | * This function is for both data pages and btnode pages. The dirty flag |
| 296 | * should be treated by caller. The page must not be under i/o. | 296 | * should be treated by caller. The page must not be under i/o. |
| 297 | * Both src and dst page must be locked | 297 | * Both src and dst page must be locked |
| 298 | */ | 298 | */ |
| @@ -388,7 +388,7 @@ repeat: | |||
| 388 | } | 388 | } |
| 389 | 389 | ||
| 390 | /** | 390 | /** |
| 391 | * nilfs_copy_back_pages -- copy back pages to orignal cache from shadow cache | 391 | * nilfs_copy_back_pages -- copy back pages to original cache from shadow cache |
| 392 | * @dmap: destination page cache | 392 | * @dmap: destination page cache |
| 393 | * @smap: source page cache | 393 | * @smap: source page cache |
| 394 | * | 394 | * |