aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorJustin P. Mattock <justinmattock@gmail.com>2011-11-28 23:31:00 -0500
committerJiri Kosina <jkosina@suse.cz>2011-12-02 08:57:31 -0500
commit42b2aa86c6670347a2a07e6d7af0e0ecc8fdbff9 (patch)
tree6f8fb2a1efb3e84bf281658befe06dc6a7fb026b /fs
parenta13b032776379fa6e2bfccf798969ca51e5fb052 (diff)
treewide: Fix typos in various parts of the kernel, and fix some comments.
The below patch fixes some typos in various parts of the kernel, as well as fixes some comments. Please let me know if I missed anything, and I will try to get it changed and resent. Signed-off-by: Justin P. Mattock <justinmattock@gmail.com> Acked-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'fs')
-rw-r--r--fs/btrfs/inode.c2
-rw-r--r--fs/ext3/inode.c2
-rw-r--r--fs/ext4/inode.c2
-rw-r--r--fs/nfsd/nfs4state.c2
-rw-r--r--fs/ocfs2/file.c2
-rw-r--r--fs/xfs/xfs_file.c6
-rw-r--r--fs/xfs/xfs_log_cil.c2
7 files changed, 9 insertions, 9 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 116ab67a06df..c3308c38ae75 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -1943,7 +1943,7 @@ enum btrfs_orphan_cleanup_state {
1943}; 1943};
1944 1944
1945/* 1945/*
1946 * This is called in transaction commmit time. If there are no orphan 1946 * This is called in transaction commit time. If there are no orphan
1947 * files in the subvolume, it removes orphan item and frees block_rsv 1947 * files in the subvolume, it removes orphan item and frees block_rsv
1948 * structure. 1948 * structure.
1949 */ 1949 */
diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c
index 85fe655fe3e0..15cb47088aac 100644
--- a/fs/ext3/inode.c
+++ b/fs/ext3/inode.c
@@ -2490,7 +2490,7 @@ int ext3_can_truncate(struct inode *inode)
2490 * transaction, and VFS/VM ensures that ext3_truncate() cannot run 2490 * transaction, and VFS/VM ensures that ext3_truncate() cannot run
2491 * simultaneously on behalf of the same inode. 2491 * simultaneously on behalf of the same inode.
2492 * 2492 *
2493 * As we work through the truncate and commmit bits of it to the journal there 2493 * As we work through the truncate and commit bits of it to the journal there
2494 * is one core, guiding principle: the file's tree must always be consistent on 2494 * is one core, guiding principle: the file's tree must always be consistent on
2495 * disk. We must be able to restart the truncate after a crash. 2495 * disk. We must be able to restart the truncate after a crash.
2496 * 2496 *
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 240f6e2dc7ee..b1c57bf43132 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -3502,7 +3502,7 @@ int ext4_punch_hole(struct file *file, loff_t offset, loff_t length)
3502 * transaction, and VFS/VM ensures that ext4_truncate() cannot run 3502 * transaction, and VFS/VM ensures that ext4_truncate() cannot run
3503 * simultaneously on behalf of the same inode. 3503 * simultaneously on behalf of the same inode.
3504 * 3504 *
3505 * As we work through the truncate and commmit bits of it to the journal there 3505 * As we work through the truncate and commit bits of it to the journal there
3506 * is one core, guiding principle: the file's tree must always be consistent on 3506 * is one core, guiding principle: the file's tree must always be consistent on
3507 * disk. We must be able to restart the truncate after a crash. 3507 * disk. We must be able to restart the truncate after a crash.
3508 * 3508 *
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 47e94e33a975..9ca16dc09e04 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -658,7 +658,7 @@ static int nfsd4_sanitize_slot_size(u32 size)
658/* 658/*
659 * XXX: If we run out of reserved DRC memory we could (up to a point) 659 * XXX: If we run out of reserved DRC memory we could (up to a point)
660 * re-negotiate active sessions and reduce their slot usage to make 660 * re-negotiate active sessions and reduce their slot usage to make
661 * rooom for new connections. For now we just fail the create session. 661 * room for new connections. For now we just fail the create session.
662 */ 662 */
663static int nfsd4_get_drc_mem(int slotsize, u32 num) 663static int nfsd4_get_drc_mem(int slotsize, u32 num)
664{ 664{
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index de4ea1af041b..199c606c56a5 100644
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -2108,7 +2108,7 @@ static int ocfs2_prepare_inode_for_write(struct file *file,
2108 * remove_suid() calls ->setattr without any hint that 2108 * remove_suid() calls ->setattr without any hint that
2109 * we may have already done our cluster locking. Since 2109 * we may have already done our cluster locking. Since
2110 * ocfs2_setattr() *must* take cluster locks to 2110 * ocfs2_setattr() *must* take cluster locks to
2111 * proceeed, this will lead us to recursively lock the 2111 * proceed, this will lead us to recursively lock the
2112 * inode. There's also the dinode i_size state which 2112 * inode. There's also the dinode i_size state which
2113 * can be lost via setattr during extending writes (we 2113 * can be lost via setattr during extending writes (we
2114 * set inode->i_size at the end of a write. */ 2114 * set inode->i_size at the end of a write. */
diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
index 753ed9b5c70b..f675f3d9d7b3 100644
--- a/fs/xfs/xfs_file.c
+++ b/fs/xfs/xfs_file.c
@@ -209,10 +209,10 @@ xfs_file_fsync(
209 209
210 /* 210 /*
211 * First check if the VFS inode is marked dirty. All the dirtying 211 * First check if the VFS inode is marked dirty. All the dirtying
212 * of non-transactional updates no goes through mark_inode_dirty*, 212 * of non-transactional updates do not go through mark_inode_dirty*,
213 * which allows us to distinguish beteeen pure timestamp updates 213 * which allows us to distinguish between pure timestamp updates
214 * and i_size updates which need to be caught for fdatasync. 214 * and i_size updates which need to be caught for fdatasync.
215 * After that also theck for the dirty state in the XFS inode, which 215 * After that also check for the dirty state in the XFS inode, which
216 * might gets cleared when the inode gets written out via the AIL 216 * might gets cleared when the inode gets written out via the AIL
217 * or xfs_iflush_cluster. 217 * or xfs_iflush_cluster.
218 */ 218 */
diff --git a/fs/xfs/xfs_log_cil.c b/fs/xfs/xfs_log_cil.c
index c7755d5a5fbe..3ba29b114323 100644
--- a/fs/xfs/xfs_log_cil.c
+++ b/fs/xfs/xfs_log_cil.c
@@ -256,7 +256,7 @@ xfs_cil_prepare_item(
256 * Insert the log items into the CIL and calculate the difference in space 256 * Insert the log items into the CIL and calculate the difference in space
257 * consumed by the item. Add the space to the checkpoint ticket and calculate 257 * consumed by the item. Add the space to the checkpoint ticket and calculate
258 * if the change requires additional log metadata. If it does, take that space 258 * if the change requires additional log metadata. If it does, take that space
259 * as well. Remove the amount of space we addded to the checkpoint ticket from 259 * as well. Remove the amount of space we added to the checkpoint ticket from
260 * the current transaction ticket so that the accounting works out correctly. 260 * the current transaction ticket so that the accounting works out correctly.
261 */ 261 */
262static void 262static void