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/alloc.h | |
| parent | 3f17522ce461a31e7ced6311b28fcf5b8a763316 (diff) | |
| parent | 7278a22143b003e9af7b9ca1b5f1c40ae4b55d98 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6
Diffstat (limited to 'fs/nilfs2/alloc.h')
| -rw-r--r-- | fs/nilfs2/alloc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nilfs2/alloc.h b/fs/nilfs2/alloc.h index f4543ac4f560..5cccf874d692 100644 --- a/fs/nilfs2/alloc.h +++ b/fs/nilfs2/alloc.h | |||
| @@ -42,7 +42,7 @@ void *nilfs_palloc_block_get_entry(const struct inode *, __u64, | |||
| 42 | const struct buffer_head *, void *); | 42 | const struct buffer_head *, void *); |
| 43 | 43 | ||
| 44 | /** | 44 | /** |
| 45 | * nilfs_palloc_req - persistent alloctor request and reply | 45 | * nilfs_palloc_req - persistent allocator request and reply |
| 46 | * @pr_entry_nr: entry number (vblocknr or inode number) | 46 | * @pr_entry_nr: entry number (vblocknr or inode number) |
| 47 | * @pr_desc_bh: buffer head of the buffer containing block group descriptors | 47 | * @pr_desc_bh: buffer head of the buffer containing block group descriptors |
| 48 | * @pr_bitmap_bh: buffer head of the buffer containing a block group bitmap | 48 | * @pr_bitmap_bh: buffer head of the buffer containing a block group bitmap |