diff options
Diffstat (limited to 'fs')
-rw-r--r-- | fs/anon_inodes.c | 6 | ||||
-rw-r--r-- | fs/coda/inode.c | 2 | ||||
-rw-r--r-- | fs/ext4/ext4.h | 2 | ||||
-rw-r--r-- | fs/ext4/extents.c | 4 | ||||
-rw-r--r-- | fs/ext4/inode.c | 6 | ||||
-rw-r--r-- | fs/jbd/transaction.c | 2 | ||||
-rw-r--r-- | fs/jbd2/transaction.c | 2 | ||||
-rw-r--r-- | fs/notify/fanotify/Kconfig | 2 | ||||
-rw-r--r-- | fs/ocfs2/inode.c | 2 | ||||
-rw-r--r-- | fs/ocfs2/suballoc.c | 2 | ||||
-rw-r--r-- | fs/xfs/linux-2.6/xfs_super.c | 2 |
11 files changed, 16 insertions, 16 deletions
diff --git a/fs/anon_inodes.c b/fs/anon_inodes.c index 57ce55b2564c..73097336ea2a 100644 --- a/fs/anon_inodes.c +++ b/fs/anon_inodes.c | |||
@@ -64,9 +64,9 @@ static const struct address_space_operations anon_aops = { | |||
64 | }; | 64 | }; |
65 | 65 | ||
66 | /** | 66 | /** |
67 | * anon_inode_getfd - creates a new file instance by hooking it up to an | 67 | * anon_inode_getfile - creates a new file instance by hooking it up to an |
68 | * anonymous inode, and a dentry that describe the "class" | 68 | * anonymous inode, and a dentry that describe the "class" |
69 | * of the file | 69 | * of the file |
70 | * | 70 | * |
71 | * @name: [in] name of the "class" of the new file | 71 | * @name: [in] name of the "class" of the new file |
72 | * @fops: [in] file operations for the new file | 72 | * @fops: [in] file operations for the new file |
diff --git a/fs/coda/inode.c b/fs/coda/inode.c index 5ea57c8c7f97..1a49c1708a54 100644 --- a/fs/coda/inode.c +++ b/fs/coda/inode.c | |||
@@ -45,7 +45,7 @@ static struct kmem_cache * coda_inode_cachep; | |||
45 | static struct inode *coda_alloc_inode(struct super_block *sb) | 45 | static struct inode *coda_alloc_inode(struct super_block *sb) |
46 | { | 46 | { |
47 | struct coda_inode_info *ei; | 47 | struct coda_inode_info *ei; |
48 | ei = (struct coda_inode_info *)kmem_cache_alloc(coda_inode_cachep, GFP_KERNEL); | 48 | ei = kmem_cache_alloc(coda_inode_cachep, GFP_KERNEL); |
49 | if (!ei) | 49 | if (!ei) |
50 | return NULL; | 50 | return NULL; |
51 | memset(&ei->c_fid, 0, sizeof(struct CodaFid)); | 51 | memset(&ei->c_fid, 0, sizeof(struct CodaFid)); |
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index 94ce3d7a1c4b..1f253a9a141d 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h | |||
@@ -577,7 +577,7 @@ struct ext4_mount_options { | |||
577 | #endif | 577 | #endif |
578 | }; | 578 | }; |
579 | 579 | ||
580 | /* Max physical block we can addres w/o extents */ | 580 | /* Max physical block we can address w/o extents */ |
581 | #define EXT4_MAX_BLOCK_FILE_PHYS 0xFFFFFFFF | 581 | #define EXT4_MAX_BLOCK_FILE_PHYS 0xFFFFFFFF |
582 | 582 | ||
583 | /* | 583 | /* |
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index 0554c48cb1fd..966ecb0d8f86 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c | |||
@@ -2825,14 +2825,14 @@ fix_extent_len: | |||
2825 | * to an uninitialized extent. | 2825 | * to an uninitialized extent. |
2826 | * | 2826 | * |
2827 | * Writing to an uninitized extent may result in splitting the uninitialized | 2827 | * Writing to an uninitized extent may result in splitting the uninitialized |
2828 | * extent into multiple /intialized unintialized extents (up to three) | 2828 | * extent into multiple /initialized uninitialized extents (up to three) |
2829 | * There are three possibilities: | 2829 | * There are three possibilities: |
2830 | * a> There is no split required: Entire extent should be uninitialized | 2830 | * a> There is no split required: Entire extent should be uninitialized |
2831 | * b> Splits in two extents: Write is happening at either end of the extent | 2831 | * b> Splits in two extents: Write is happening at either end of the extent |
2832 | * c> Splits in three extents: Somone is writing in middle of the extent | 2832 | * c> Splits in three extents: Somone is writing in middle of the extent |
2833 | * | 2833 | * |
2834 | * One of more index blocks maybe needed if the extent tree grow after | 2834 | * One of more index blocks maybe needed if the extent tree grow after |
2835 | * the unintialized extent split. To prevent ENOSPC occur at the IO | 2835 | * the uninitialized extent split. To prevent ENOSPC occur at the IO |
2836 | * complete, we need to split the uninitialized extent before DIO submit | 2836 | * complete, we need to split the uninitialized extent before DIO submit |
2837 | * the IO. The uninitialized extent called at this time will be split | 2837 | * the IO. The uninitialized extent called at this time will be split |
2838 | * into three uninitialized extent(at most). After IO complete, the part | 2838 | * into three uninitialized extent(at most). After IO complete, the part |
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index e659597b690b..ef9d5be0b2a8 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c | |||
@@ -3362,7 +3362,7 @@ int ext4_alloc_da_blocks(struct inode *inode) | |||
3362 | * doing I/O at all. | 3362 | * doing I/O at all. |
3363 | * | 3363 | * |
3364 | * We could call write_cache_pages(), and then redirty all of | 3364 | * We could call write_cache_pages(), and then redirty all of |
3365 | * the pages by calling redirty_page_for_writeback() but that | 3365 | * the pages by calling redirty_page_for_writepage() but that |
3366 | * would be ugly in the extreme. So instead we would need to | 3366 | * would be ugly in the extreme. So instead we would need to |
3367 | * replicate parts of the code in the above functions, | 3367 | * replicate parts of the code in the above functions, |
3368 | * simplifying them becuase we wouldn't actually intend to | 3368 | * simplifying them becuase we wouldn't actually intend to |
@@ -3745,9 +3745,9 @@ retry: | |||
3745 | * preallocated extents, and those write extend the file, no need to | 3745 | * preallocated extents, and those write extend the file, no need to |
3746 | * fall back to buffered IO. | 3746 | * fall back to buffered IO. |
3747 | * | 3747 | * |
3748 | * For holes, we fallocate those blocks, mark them as unintialized | 3748 | * For holes, we fallocate those blocks, mark them as uninitialized |
3749 | * If those blocks were preallocated, we mark sure they are splited, but | 3749 | * If those blocks were preallocated, we mark sure they are splited, but |
3750 | * still keep the range to write as unintialized. | 3750 | * still keep the range to write as uninitialized. |
3751 | * | 3751 | * |
3752 | * The unwrritten extents will be converted to written when DIO is completed. | 3752 | * The unwrritten extents will be converted to written when DIO is completed. |
3753 | * For async direct IO, since the IO may still pending when return, we | 3753 | * For async direct IO, since the IO may still pending when return, we |
diff --git a/fs/jbd/transaction.c b/fs/jbd/transaction.c index 846a3f314111..5b2e4c30a2a1 100644 --- a/fs/jbd/transaction.c +++ b/fs/jbd/transaction.c | |||
@@ -207,7 +207,7 @@ repeat_locked: | |||
207 | * the committing transaction. Really, we only need to give it | 207 | * the committing transaction. Really, we only need to give it |
208 | * committing_transaction->t_outstanding_credits plus "enough" for | 208 | * committing_transaction->t_outstanding_credits plus "enough" for |
209 | * the log control blocks. | 209 | * the log control blocks. |
210 | * Also, this test is inconsitent with the matching one in | 210 | * Also, this test is inconsistent with the matching one in |
211 | * journal_extend(). | 211 | * journal_extend(). |
212 | */ | 212 | */ |
213 | if (__log_space_left(journal) < jbd_space_needed(journal)) { | 213 | if (__log_space_left(journal) < jbd_space_needed(journal)) { |
diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c index 6bf0a242613e..c7934900dcdd 100644 --- a/fs/jbd2/transaction.c +++ b/fs/jbd2/transaction.c | |||
@@ -251,7 +251,7 @@ repeat: | |||
251 | * the committing transaction. Really, we only need to give it | 251 | * the committing transaction. Really, we only need to give it |
252 | * committing_transaction->t_outstanding_credits plus "enough" for | 252 | * committing_transaction->t_outstanding_credits plus "enough" for |
253 | * the log control blocks. | 253 | * the log control blocks. |
254 | * Also, this test is inconsitent with the matching one in | 254 | * Also, this test is inconsistent with the matching one in |
255 | * jbd2_journal_extend(). | 255 | * jbd2_journal_extend(). |
256 | */ | 256 | */ |
257 | if (__jbd2_log_space_left(journal) < jbd_space_needed(journal)) { | 257 | if (__jbd2_log_space_left(journal) < jbd_space_needed(journal)) { |
diff --git a/fs/notify/fanotify/Kconfig b/fs/notify/fanotify/Kconfig index 3ac36b7bf6b9..7dceff005a67 100644 --- a/fs/notify/fanotify/Kconfig +++ b/fs/notify/fanotify/Kconfig | |||
@@ -6,7 +6,7 @@ config FANOTIFY | |||
6 | ---help--- | 6 | ---help--- |
7 | Say Y here to enable fanotify suport. fanotify is a file access | 7 | Say Y here to enable fanotify suport. fanotify is a file access |
8 | notification system which differs from inotify in that it sends | 8 | notification system which differs from inotify in that it sends |
9 | and open file descriptor to the userspace listener along with | 9 | an open file descriptor to the userspace listener along with |
10 | the event. | 10 | the event. |
11 | 11 | ||
12 | If unsure, say Y. | 12 | If unsure, say Y. |
diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c index f935fd6600dd..4068c6c4c6f6 100644 --- a/fs/ocfs2/inode.c +++ b/fs/ocfs2/inode.c | |||
@@ -434,7 +434,7 @@ static int ocfs2_read_locked_inode(struct inode *inode, | |||
434 | * #1 and #2 can be simply solved by never taking the lock | 434 | * #1 and #2 can be simply solved by never taking the lock |
435 | * here for system files (which are the only type we read | 435 | * here for system files (which are the only type we read |
436 | * during mount). It's a heavier approach, but our main | 436 | * during mount). It's a heavier approach, but our main |
437 | * concern is user-accesible files anyway. | 437 | * concern is user-accessible files anyway. |
438 | * | 438 | * |
439 | * #3 works itself out because we'll eventually take the | 439 | * #3 works itself out because we'll eventually take the |
440 | * cluster lock before trusting anything anyway. | 440 | * cluster lock before trusting anything anyway. |
diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c index 5fed60de7630..71998d4d61d5 100644 --- a/fs/ocfs2/suballoc.c +++ b/fs/ocfs2/suballoc.c | |||
@@ -1916,7 +1916,7 @@ static int ocfs2_claim_suballoc_bits(struct ocfs2_alloc_context *ac, | |||
1916 | if (res->sr_bg_blkno) { | 1916 | if (res->sr_bg_blkno) { |
1917 | /* Attempt to short-circuit the usual search mechanism | 1917 | /* Attempt to short-circuit the usual search mechanism |
1918 | * by jumping straight to the most recently used | 1918 | * by jumping straight to the most recently used |
1919 | * allocation group. This helps us mantain some | 1919 | * allocation group. This helps us maintain some |
1920 | * contiguousness across allocations. */ | 1920 | * contiguousness across allocations. */ |
1921 | status = ocfs2_search_one_group(ac, handle, bits_wanted, | 1921 | status = ocfs2_search_one_group(ac, handle, bits_wanted, |
1922 | min_bits, res, &bits_left); | 1922 | min_bits, res, &bits_left); |
diff --git a/fs/xfs/linux-2.6/xfs_super.c b/fs/xfs/linux-2.6/xfs_super.c index 064f964d4f3c..c115dd5e95a8 100644 --- a/fs/xfs/linux-2.6/xfs_super.c +++ b/fs/xfs/linux-2.6/xfs_super.c | |||
@@ -935,7 +935,7 @@ out_reclaim: | |||
935 | * Slab object creation initialisation for the XFS inode. | 935 | * Slab object creation initialisation for the XFS inode. |
936 | * This covers only the idempotent fields in the XFS inode; | 936 | * This covers only the idempotent fields in the XFS inode; |
937 | * all other fields need to be initialised on allocation | 937 | * all other fields need to be initialised on allocation |
938 | * from the slab. This avoids the need to repeatedly intialise | 938 | * from the slab. This avoids the need to repeatedly initialise |
939 | * fields in the xfs inode that left in the initialise state | 939 | * fields in the xfs inode that left in the initialise state |
940 | * when freeing the inode. | 940 | * when freeing the inode. |
941 | */ | 941 | */ |