From 353a286c6c76d9dfc1f8568fb637395346220979 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Tue, 16 Mar 2010 00:02:25 +0000
Subject: [PATCH] --- yaml --- r: 188232 b: refs/heads/master c:
 854d2c3531e6d32e76b94ca5e096ea54c7497e40 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index ece40649d6be..dc3c22b6df2b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ef5780c018ed169a77b623f87c4ba52faa8ad0fe
+refs/heads/master: 854d2c3531e6d32e76b94ca5e096ea54c7497e40
diff --git a/trunk/fs/btrfs/ioctl.c b/trunk/fs/btrfs/ioctl.c
index 363e209679b6..38a68863390a 100644
--- a/trunk/fs/btrfs/ioctl.c
+++ b/trunk/fs/btrfs/ioctl.c
@@ -1000,7 +1000,7 @@ static noinline int copy_to_sk(struct btrfs_root *root,
 advance_key:
 	if (key->offset < (u64)-1)
 		key->offset++;
-	else if (key->type < (u64)-1)
+	else if (key->type < (u8)-1)
 		key->type++;
 	else if (key->objectid < (u64)-1)
 		key->objectid++;