Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[karo-tx-linux.git] / fs / ocfs2 / extent_map.c

diff --git a/fs/ocfs2/extent_map.c b/fs/ocfs2/extent_map.c
index d35a27f4523e13e2ec00411e08e6ebb2e1afbf76..c562a7581cf93b709e79d70be22034f1e5be7a63 100644 (file)
--- a/fs/ocfs2/extent_map.c
+++ b/fs/ocfs2/extent_map.c
@@ -192,7 +192,7 @@ static int ocfs2_try_to_merge_extent_map(struct ocfs2_extent_map_item *emi,
                emi->ei_clusters += ins->ei_clusters;
                return 1;
        } else if ((ins->ei_phys + ins->ei_clusters) == emi->ei_phys &&
-                  (ins->ei_cpos + ins->ei_clusters) == emi->ei_phys &&
+                  (ins->ei_cpos + ins->ei_clusters) == emi->ei_cpos &&
                   ins->ei_flags == emi->ei_flags) {
                emi->ei_phys = ins->ei_phys;
                emi->ei_cpos = ins->ei_cpos;
@@ -453,7 +453,7 @@ static int ocfs2_get_clusters_nocache(struct inode *inode,
        if (i == -1) {
                /*
                 * Holes can be larger than the maximum size of an
-                * extent, so we return their lengths in a seperate
+                * extent, so we return their lengths in a separate
                 * field.
                 */
                if (hole_len) {