btrfs: Fix typos in comments and strings

The typos accumulate over time so once in a while time they get fixed in
a large patch.

Signed-off-by: Andrea Gelmini <andrea.gelmini@gelma.net>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index 5baad9bebc62..ac232b3d6d7e 100644
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -1144,7 +1144,7 @@ next:
         }
         btrfs_release_path(path);
 
-        /* look for a conflicing name */
+        /* look for a conflicting name */
         di = btrfs_lookup_dir_item(trans, root, path, btrfs_ino(dir),
                                    name, namelen, 0);
         if (di && !IS_ERR(di)) {
@@ -3149,7 +3149,7 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,
         mutex_unlock(&log_root_tree->log_mutex);
 
         /*
-         * nobody else is going to jump in and write the the ctree
+         * Nobody else is going to jump in and write the ctree
          * super here because the log_commit atomic below is protecting
          * us.  We must be called with a transaction handle pinning
          * the running transaction open, so a full commit can't hop