aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
Diffstat (limited to 'fs')
-rw-r--r--fs/ext4/ext4.h2
-rw-r--r--fs/ext4/extents.c4
-rw-r--r--fs/ext4/inode.c4
-rw-r--r--fs/ocfs2/inode.c2
-rw-r--r--fs/ocfs2/suballoc.c2
-rw-r--r--fs/xfs/linux-2.6/xfs_super.c2
6 files changed, 8 insertions, 8 deletions
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index 8b5dd6369f82..47162de0b957 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 191616470466..4bc84b8adb7f 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -3740,9 +3740,9 @@ retry:
3740 * preallocated extents, and those write extend the file, no need to 3740 * preallocated extents, and those write extend the file, no need to
3741 * fall back to buffered IO. 3741 * fall back to buffered IO.
3742 * 3742 *
3743 * For holes, we fallocate those blocks, mark them as unintialized 3743 * For holes, we fallocate those blocks, mark them as uninitialized
3744 * If those blocks were preallocated, we mark sure they are splited, but 3744 * If those blocks were preallocated, we mark sure they are splited, but
3745 * still keep the range to write as unintialized. 3745 * still keep the range to write as uninitialized.
3746 * 3746 *
3747 * The unwrritten extents will be converted to written when DIO is completed. 3747 * The unwrritten extents will be converted to written when DIO is completed.
3748 * For async direct IO, since the IO may still pending when return, we 3748 * For async direct IO, since the IO may still pending when return, we
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 9f3a78fe6ae4..7465a7ffc4fd 100644
--- a/fs/xfs/linux-2.6/xfs_super.c
+++ b/fs/xfs/linux-2.6/xfs_super.c
@@ -938,7 +938,7 @@ out_reclaim:
938 * Slab object creation initialisation for the XFS inode. 938 * Slab object creation initialisation for the XFS inode.
939 * This covers only the idempotent fields in the XFS inode; 939 * This covers only the idempotent fields in the XFS inode;
940 * all other fields need to be initialised on allocation 940 * all other fields need to be initialised on allocation
941 * from the slab. This avoids the need to repeatedly intialise 941 * from the slab. This avoids the need to repeatedly initialise
942 * fields in the xfs inode that left in the initialise state 942 * fields in the xfs inode that left in the initialise state
943 * when freeing the inode. 943 * when freeing the inode.
944 */ 944 */