diff options
Diffstat (limited to 'fs/nilfs2')
-rw-r--r-- | fs/nilfs2/alloc.h | 2 | ||||
-rw-r--r-- | fs/nilfs2/dat.c | 2 | ||||
-rw-r--r-- | fs/nilfs2/gcinode.c | 4 | ||||
-rw-r--r-- | fs/nilfs2/page.c | 4 | ||||
-rw-r--r-- | fs/nilfs2/segbuf.c | 2 | ||||
-rw-r--r-- | fs/nilfs2/segment.c | 4 | ||||
-rw-r--r-- | fs/nilfs2/segment.h | 2 | ||||
-rw-r--r-- | fs/nilfs2/sufile.c | 2 | ||||
-rw-r--r-- | fs/nilfs2/super.c | 2 |
9 files changed, 12 insertions, 12 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 |
diff --git a/fs/nilfs2/dat.c b/fs/nilfs2/dat.c index 9d1e5de91afb..013146755683 100644 --- a/fs/nilfs2/dat.c +++ b/fs/nilfs2/dat.c | |||
@@ -288,7 +288,7 @@ int nilfs_dat_mark_dirty(struct inode *dat, __u64 vblocknr) | |||
288 | * @vblocknrs and @nitems. | 288 | * @vblocknrs and @nitems. |
289 | * | 289 | * |
290 | * Return Value: On success, 0 is returned. On error, one of the following | 290 | * Return Value: On success, 0 is returned. On error, one of the following |
291 | * nagative error codes is returned. | 291 | * negative error codes is returned. |
292 | * | 292 | * |
293 | * %-EIO - I/O error. | 293 | * %-EIO - I/O error. |
294 | * | 294 | * |
diff --git a/fs/nilfs2/gcinode.c b/fs/nilfs2/gcinode.c index e16a6664dfa2..8880a9e281e7 100644 --- a/fs/nilfs2/gcinode.c +++ b/fs/nilfs2/gcinode.c | |||
@@ -28,10 +28,10 @@ | |||
28 | * gcinodes), and this file provides lookup function of the dummy | 28 | * gcinodes), and this file provides lookup function of the dummy |
29 | * inodes and their buffer read function. | 29 | * inodes and their buffer read function. |
30 | * | 30 | * |
31 | * Since NILFS2 keeps up multiple checkpoints/snapshots accross GC, it | 31 | * Since NILFS2 keeps up multiple checkpoints/snapshots across GC, it |
32 | * has to treat blocks that belong to a same file but have different | 32 | * has to treat blocks that belong to a same file but have different |
33 | * checkpoint numbers. To avoid interference among generations, dummy | 33 | * checkpoint numbers. To avoid interference among generations, dummy |
34 | * inodes are managed separatly from actual inodes, and their lookup | 34 | * inodes are managed separately from actual inodes, and their lookup |
35 | * function (nilfs_gc_iget) is designed to be specified with a | 35 | * function (nilfs_gc_iget) is designed to be specified with a |
36 | * checkpoint number argument as well as an inode number. | 36 | * checkpoint number argument as well as an inode number. |
37 | * | 37 | * |
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 | * |
diff --git a/fs/nilfs2/segbuf.c b/fs/nilfs2/segbuf.c index 68b08f21c648..e3f67c6ce1a7 100644 --- a/fs/nilfs2/segbuf.c +++ b/fs/nilfs2/segbuf.c | |||
@@ -174,7 +174,7 @@ int nilfs_segbuf_reset(struct nilfs_segment_buffer *segbuf, unsigned flags, | |||
174 | } | 174 | } |
175 | 175 | ||
176 | /* | 176 | /* |
177 | * Setup segument summary | 177 | * Setup segment summary |
178 | */ | 178 | */ |
179 | void nilfs_segbuf_fill_in_segsum(struct nilfs_segment_buffer *segbuf) | 179 | void nilfs_segbuf_fill_in_segsum(struct nilfs_segment_buffer *segbuf) |
180 | { | 180 | { |
diff --git a/fs/nilfs2/segment.c b/fs/nilfs2/segment.c index 3265bfc57e42..69576a95e13f 100644 --- a/fs/nilfs2/segment.c +++ b/fs/nilfs2/segment.c | |||
@@ -201,7 +201,7 @@ static int nilfs_prepare_segment_lock(struct nilfs_transaction_info *ti) | |||
201 | * This function allocates a nilfs_transaction_info struct to keep context | 201 | * This function allocates a nilfs_transaction_info struct to keep context |
202 | * information on it. It is initialized and hooked onto the current task in | 202 | * information on it. It is initialized and hooked onto the current task in |
203 | * the outermost call. If a pre-allocated struct is given to @ti, it is used | 203 | * the outermost call. If a pre-allocated struct is given to @ti, it is used |
204 | * instead; othewise a new struct is assigned from a slab. | 204 | * instead; otherwise a new struct is assigned from a slab. |
205 | * | 205 | * |
206 | * When @vacancy_check flag is set, this function will check the amount of | 206 | * When @vacancy_check flag is set, this function will check the amount of |
207 | * free space, and will wait for the GC to reclaim disk space if low capacity. | 207 | * free space, and will wait for the GC to reclaim disk space if low capacity. |
@@ -2854,7 +2854,7 @@ static void nilfs_segctor_destroy(struct nilfs_sc_info *sci) | |||
2854 | * @sbi: nilfs_sb_info | 2854 | * @sbi: nilfs_sb_info |
2855 | * | 2855 | * |
2856 | * nilfs_attach_segment_constructor() allocates a struct nilfs_sc_info, | 2856 | * nilfs_attach_segment_constructor() allocates a struct nilfs_sc_info, |
2857 | * initilizes it, and starts the segment constructor. | 2857 | * initializes it, and starts the segment constructor. |
2858 | * | 2858 | * |
2859 | * Return Value: On success, 0 is returned. On error, one of the following | 2859 | * Return Value: On success, 0 is returned. On error, one of the following |
2860 | * negative error code is returned. | 2860 | * negative error code is returned. |
diff --git a/fs/nilfs2/segment.h b/fs/nilfs2/segment.h index 3155e0c7f415..2a794569dd14 100644 --- a/fs/nilfs2/segment.h +++ b/fs/nilfs2/segment.h | |||
@@ -30,7 +30,7 @@ | |||
30 | #include "sb.h" | 30 | #include "sb.h" |
31 | 31 | ||
32 | /** | 32 | /** |
33 | * struct nilfs_recovery_info - Recovery infomation | 33 | * struct nilfs_recovery_info - Recovery information |
34 | * @ri_need_recovery: Recovery status | 34 | * @ri_need_recovery: Recovery status |
35 | * @ri_super_root: Block number of the last super root | 35 | * @ri_super_root: Block number of the last super root |
36 | * @ri_ri_cno: Number of the last checkpoint | 36 | * @ri_ri_cno: Number of the last checkpoint |
diff --git a/fs/nilfs2/sufile.c b/fs/nilfs2/sufile.c index b6c36d0cc331..3c6cc6005c2e 100644 --- a/fs/nilfs2/sufile.c +++ b/fs/nilfs2/sufile.c | |||
@@ -18,7 +18,7 @@ | |||
18 | * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | 18 | * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
19 | * | 19 | * |
20 | * Written by Koji Sato <koji@osrg.net>. | 20 | * Written by Koji Sato <koji@osrg.net>. |
21 | * Rivised by Ryusuke Konishi <ryusuke@osrg.net>. | 21 | * Revised by Ryusuke Konishi <ryusuke@osrg.net>. |
22 | */ | 22 | */ |
23 | 23 | ||
24 | #include <linux/kernel.h> | 24 | #include <linux/kernel.h> |
diff --git a/fs/nilfs2/super.c b/fs/nilfs2/super.c index 92579cc4c935..896b463cc3ce 100644 --- a/fs/nilfs2/super.c +++ b/fs/nilfs2/super.c | |||
@@ -436,7 +436,7 @@ static int nilfs_statfs(struct dentry *dentry, struct kstatfs *buf) | |||
436 | /* | 436 | /* |
437 | * Compute the overhead | 437 | * Compute the overhead |
438 | * | 438 | * |
439 | * When distributing meta data blocks outside semgent structure, | 439 | * When distributing meta data blocks outside segment structure, |
440 | * We must count them as the overhead. | 440 | * We must count them as the overhead. |
441 | */ | 441 | */ |
442 | overhead = 0; | 442 | overhead = 0; |