]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Btrfs: fix search_ioctl key advance
authorSage Weil <sage@newdream.net>
Tue, 16 Mar 2010 00:02:25 +0000 (00:02 +0000)
committerChris Mason <chris.mason@oracle.com>
Tue, 16 Mar 2010 18:24:27 +0000 (14:24 -0400)
key->type is u8, not u64.

fs/btrfs/ioctl.c: In function 'copy_to_sk':
fs/btrfs/ioctl.c:1024: warning: comparison is always true due to limited range of data type

Signed-off-by: Sage Weil <sage@newdream.net>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
fs/btrfs/ioctl.c

index 363e209679b604abdd6a9407e6b34227fa4e9f29..38a68863390a635654fdcf49335a4bab7e04c185 100644 (file)
@@ -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++;