From 1ced99386d0aa60504958a561f3369c63ddfc7b2 Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Fri, 3 Apr 2009 10:33:45 -0400 Subject: [PATCH] --- yaml --- r: 140337 b: refs/heads/master c: 93dbfad7ac647d4f00354893fe93e8a55be114d5 h: refs/heads/master i: 140335: ffc1e02ada1a356423855e8ae40bbd941afcd891 v: v3 --- [refs] | 2 +- trunk/fs/btrfs/extent_io.c | 16 +++++----------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index 443728772236..4375f0f80278 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 09771430f3b46ee27c69daa7ecad82007568e834 +refs/heads/master: 93dbfad7ac647d4f00354893fe93e8a55be114d5 diff --git a/trunk/fs/btrfs/extent_io.c b/trunk/fs/btrfs/extent_io.c index 08085af089e2..eb2bee8b7fbf 100644 --- a/trunk/fs/btrfs/extent_io.c +++ b/trunk/fs/btrfs/extent_io.c @@ -2884,25 +2884,19 @@ int extent_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, disko = 0; flags = 0; - switch (em->block_start) { - case EXTENT_MAP_LAST_BYTE: + if (em->block_start == EXTENT_MAP_LAST_BYTE) { end = 1; flags |= FIEMAP_EXTENT_LAST; - break; - case EXTENT_MAP_HOLE: + } else if (em->block_start == EXTENT_MAP_HOLE) { flags |= FIEMAP_EXTENT_UNWRITTEN; - break; - case EXTENT_MAP_INLINE: + } else if (em->block_start == EXTENT_MAP_INLINE) { flags |= (FIEMAP_EXTENT_DATA_INLINE | FIEMAP_EXTENT_NOT_ALIGNED); - break; - case EXTENT_MAP_DELALLOC: + } else if (em->block_start == EXTENT_MAP_DELALLOC) { flags |= (FIEMAP_EXTENT_DELALLOC | FIEMAP_EXTENT_UNKNOWN); - break; - default: + } else { disko = em->block_start; - break; } if (test_bit(EXTENT_FLAG_COMPRESSED, &em->flags)) flags |= FIEMAP_EXTENT_ENCODED;