From b556ed9a0c627a1c24390bd7981ba988607a53b7 Mon Sep 17 00:00:00 2001
From: Adrian Hunter <ext-adrian.hunter@nokia.com>
Date: Wed, 23 Jul 2008 15:48:39 +0300
Subject: [PATCH] --- yaml --- r: 108543 b: refs/heads/master c:
 7d62ff2c396470bb62a3853f14d3962eac1da974 h: refs/heads/master i:   108541:
 e7f231c5598e35c1cf602a809eca32286e69bc3e   108539:
 7f8f9fdcd129893ffd824619a63863591745e85f   108535:
 38625f3ad3232a0354b9c07b941bcc0dc72d089e   108527:
 33824ce14272930c4b13d4eb43617ca3c96f9677   108511:
 e87772a8b7eeb8e940572a0ed682345c5e8449ee   108479:
 444207dbc9ee613c6bc913cb2665edfd30e0ebd6   108415:
 1d6937569834063716423c68f007cadb89bbde72   108287:
 047cb3e24a3b7107a66dd18aa49c26e5128996f6   108031:
 9592a77fd46d3c6ddbebe13d5c782e34cfed87e0   107519:
 6a6a436dcd11ecc863eb73befd8f79dd5521f40e   106495:
 875b556c2a6c4cb2319b38607585bd7a1a584c3a v: v3

---
 [refs]                   |  2 +-
 trunk/fs/ubifs/journal.c | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 2975b4456a9d..f2f02b245227 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bc813355c704e5916a86dd4b96fd226bfa3fc6ca
+refs/heads/master: 7d62ff2c396470bb62a3853f14d3962eac1da974
diff --git a/trunk/fs/ubifs/journal.c b/trunk/fs/ubifs/journal.c
index 0bcee7d221e8..25de6fde383f 100644
--- a/trunk/fs/ubifs/journal.c
+++ b/trunk/fs/ubifs/journal.c
@@ -822,7 +822,7 @@ int ubifs_jnl_write_inode(struct ubifs_info *c, const struct inode *inode)
 }
 
 /**
- * ubifs_jnl_write_inode - delete an inode.
+ * ubifs_jnl_delete_inode - delete an inode.
  * @c: UBIFS file-system description object
  * @inode: inode to delete
  *
@@ -831,21 +831,21 @@ int ubifs_jnl_write_inode(struct ubifs_info *c, const struct inode *inode)
  * journal.
  *
  * When regular file inodes are unlinked or a directory inode is removed, the
- * 'ubifs_jnl_update()' function write corresponding deletion inode and
+ * 'ubifs_jnl_update()' function writes a corresponding deletion inode and
  * direntry to the media, and adds the inode to orphans. After this, when the
  * last reference to this inode has been dropped, this function is called. In
  * general, it has to write one more deletion inode to the media, because if
  * a commit happened between 'ubifs_jnl_update()' and
  * 'ubifs_jnl_delete_inode()', the deletion inode is not in the journal
- * anymore, and in fact it might be not on the flash anymore, becouse it might
- * have been garbage-collected already. And for optimization reasond UBIFS does
+ * anymore, and in fact it might not be on the flash anymore, because it might
+ * have been garbage-collected already. And for optimization reasons UBIFS does
  * not read the orphan area if it has been unmounted cleanly, so it would have
  * no indication in the journal that there is a deleted inode which has to be
  * removed from TNC.
  *
  * However, if there was no commit between 'ubifs_jnl_update()' and
  * 'ubifs_jnl_delete_inode()', then there is no need to write the deletion
- * inode to the media for the second time. And this is quite typical case.
+ * inode to the media for the second time. And this is quite a typical case.
  *
  * This function returns zero in case of success and a negative error code in
  * case of failure.