toracat / rpms / kernel

Forked from rpms/kernel 5 years ago
Clone

Blame SOURCES/centos-linux-3.10-reiserfs-fix-redefine-error.patch

24d93b
centosplus patch
24d93b
24d93b
Building reiserfs.ko under EL7.1 produces error:
24d93b
24d93b
In file included from fs/reiserfs/bitmap.c:7:0:
24d93b
fs/reiserfs/reiserfs.h:1957:0: error: "U32_MAX" redefined [-Werror]
24d93b
 #define U32_MAX (~(__u32)0)
24d93b
24d93b
Solution:
24d93b
24d93b
In EL7.1 kernels (>= 210), U32_MAX is defined in include/linux/kernel.h
24d93b
This define now needs to be deleted from reiserfs.h
24d93b
24d93b
Applied-by: Akemi Yagi <toracat@centos.org>
24d93b
24d93b
--- a/fs/reiserfs/reiserfs.h	2014-11-24 14:38:58.000000000 -0800
24d93b
+++ b/fs/reiserfs/reiserfs.h	2015-01-12 15:34:40.187297040 -0800
24d93b
@@ -1954,7 +1954,6 @@ struct treepath var = {.path_length = IL
24d93b
 #define MAX_US_INT 0xffff
24d93b
 
24d93b
 // reiserfs version 2 has max offset 60 bits. Version 1 - 32 bit offset
24d93b
-#define U32_MAX (~(__u32)0)
24d93b
 
24d93b
 static inline loff_t max_reiserfs_offset(struct inode *inode)
24d93b
 {