[kernel] r13462 - in dists/sid/linux-2.6/debian: . patches/bugfix/all patches/series

[Dann Frazier]

Author: dannf
Date: Mon Apr 20 23:54:01 2009
New Revision: 13462

Log:
Btrfs: fix __ucmpdi2 compile bug on 32 bit builds

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/btrfs-fix-__ucmpdi2-compile-bug.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/4

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Mon Apr 20 21:20:04 2009	(r13461)
+++ dists/sid/linux-2.6/debian/changelog	Mon Apr 20 23:54:01 2009	(r13462)
@@ -10,6 +10,7 @@
   [ dann frazier ]
   * [parisc] Fix macro expansion in atomic.h fixing PHONET compilation issue
   * [parisc] reenable PHONET
+  * Btrfs: fix __ucmpdi2 compile bug on 32 bit builds
 
  -- maximilian attems <maks at debian.org>  Fri, 17 Apr 2009 11:30:55 +0200
 

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/btrfs-fix-__ucmpdi2-compile-bug.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/btrfs-fix-__ucmpdi2-compile-bug.patch	Mon Apr 20 23:54:01 2009	(r13462)
@@ -0,0 +1,52 @@
+commit 93dbfad7ac647d4f00354893fe93e8a55be114d5
+Author: Heiko Carstens <heiko.carstens at de.ibm.com>
+Date:   Fri Apr 3 10:33:45 2009 -0400
+
+    Btrfs: fix __ucmpdi2 compile bug on 32 bit builds
+    
+    We get this on 32 builds:
+    
+    fs/built-in.o: In function `extent_fiemap':
+    (.text+0x1019f2): undefined reference to `__ucmpdi2'
+    
+    Happens because of a switch statement with a 64 bit argument.
+    Convert this to an if statement to fix this.
+    
+    Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
+    Signed-off-by: Chris Mason <chris.mason at oracle.com>
+
+diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
+index 08085af..eb2bee8 100644
+--- a/fs/btrfs/extent_io.c
++++ b/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;

Modified: dists/sid/linux-2.6/debian/patches/series/4
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/4	Mon Apr 20 21:20:04 2009	(r13461)
+++ dists/sid/linux-2.6/debian/patches/series/4	Mon Apr 20 23:54:01 2009	(r13462)
@@ -1,3 +1,4 @@
 + bugfix/all/drm-intel.git-f544847fbaf099278343f875987a983f2b913134.patch
 + bugfix/all/extend-erase-timeout-spi-flash.patch
 + bugfix/parisc/fix-macro-expansion-in-atomic.h.patch
++ bugfix/all/btrfs-fix-__ucmpdi2-compile-bug.patch