From 49353f9ed6db720ba1054d897aab497681ae4905 Mon Sep 17 00:00:00 2001
From: Masanari Iida <standby24x7@gmail.com>
Date: Wed, 31 Oct 2012 15:16:32 +0000
Subject: [PATCH] --- yaml --- r: 346655 b: refs/heads/master c:
 d1423248734df6d9aff769abffd675dc034e0601 h: refs/heads/master i:   346653:
 bcbbf0401ffa2421a6d86ca92908c0744003fab7   346651:
 c28e4d4cf05db6f0e7e4275382cf682d41cbce88   346647:
 b4974ae4a32324734978374b83fd8488bcea5614   346639:
 a206378d4a67219444b7de03b01f0ba2bfbdf297   346623:
 ba5383829df44978c396d8c5300c2f8dc931e463 v: v3

---
 [refs]                   | 2 +-
 trunk/fs/btrfs/ctree.h   | 2 +-
 trunk/fs/btrfs/volumes.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a609fe69c819..e497c6d4fdd2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0253f40ef9a709a1af39ce38b1d998af090f8127
+refs/heads/master: d1423248734df6d9aff769abffd675dc034e0601
diff --git a/trunk/fs/btrfs/ctree.h b/trunk/fs/btrfs/ctree.h
index cad16566da37..2d41cb25266b 100644
--- a/trunk/fs/btrfs/ctree.h
+++ b/trunk/fs/btrfs/ctree.h
@@ -413,7 +413,7 @@ struct btrfs_root_backup {
 	__le64 bytes_used;
 	__le64 num_devices;
 	/* future */
-	__le64 unsed_64[4];
+	__le64 unused_64[4];
 
 	u8 tree_root_level;
 	u8 chunk_root_level;
diff --git a/trunk/fs/btrfs/volumes.c b/trunk/fs/btrfs/volumes.c
index 32a88428f6da..eeed97d19dee 100644
--- a/trunk/fs/btrfs/volumes.c
+++ b/trunk/fs/btrfs/volumes.c
@@ -4261,7 +4261,7 @@ static void submit_stripe_bio(struct btrfs_root *root, struct btrfs_bio *bbio,
 
 		rcu_read_lock();
 		name = rcu_dereference(dev->name);
-		pr_debug("btrfs_map_bio: rw %d, secor=%llu, dev=%lu "
+		pr_debug("btrfs_map_bio: rw %d, sector=%llu, dev=%lu "
 			 "(%s id %llu), size=%u\n", rw,
 			 (u64)bio->bi_sector, (u_long)dev->bdev->bd_dev,
 			 name->str, dev->devid, bio->bi_size);