From e22ca4a95a7afe96c5071fe88e43fc2d404c86ea Mon Sep 17 00:00:00 2001
From: Masanari Iida <standby24x7@gmail.com>
Date: Thu, 1 Nov 2012 00:16:32 +0900
Subject: [PATCH] --- yaml --- r: 343025 b: refs/heads/master c:
 926ccfef82413623ae0e5c3a32d0cad2b9f33e96 h: refs/heads/master i:   343023:
 579ad385d81a84f53cb4b5541cb22a142d828d69 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 cbe99c29808a..4b4f69225a2c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 52b1de91ea07d1f5600b3cae789d5be9a1f61787
+refs/heads/master: 926ccfef82413623ae0e5c3a32d0cad2b9f33e96
diff --git a/trunk/fs/btrfs/ctree.h b/trunk/fs/btrfs/ctree.h
index c72ead869507..596617ecd329 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 0f5ebb72a5ea..e3c6ee3cc2ba 100644
--- a/trunk/fs/btrfs/volumes.c
+++ b/trunk/fs/btrfs/volumes.c
@@ -4294,7 +4294,7 @@ int btrfs_map_bio(struct btrfs_root *root, int rw, struct bio *bio,
 
 			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);