Merge branch 'master' into for-next
[linux-2.6.git] / fs / direct-io.c
index b044705..dcb5577 100644 (file)
@@ -645,11 +645,11 @@ static int dio_send_cur_page(struct dio *dio)
                /*
                 * See whether this new request is contiguous with the old.
                 *
-                * Btrfs cannot handl having logically non-contiguous requests
-                * submitted.  For exmple if you have
+                * Btrfs cannot handle having logically non-contiguous requests
+                * submitted.  For example if you have
                 *
                 * Logical:  [0-4095][HOLE][8192-12287]
-                * Phyiscal: [0-4095]      [4096-8181]
+                * Physical: [0-4095]      [4096-8191]
                 *
                 * We cannot submit those pages together as one BIO.  So if our
                 * current logical offset in the file does not equal what would