Hello community, here is the log from the commit of package reiserfs for openSUSE:Factory checked in at 2013-09-27 18:04:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/reiserfs (Old) and /work/SRC/openSUSE:Factory/.reiserfs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "reiserfs" Changes: -------- --- /work/SRC/openSUSE:Factory/reiserfs/reiserfs.changes 2013-09-17 15:03:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.reiserfs.new/reiserfs.changes 2013-09-27 18:04:41.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Sep 17 17:36:01 UTC 2013 - je...@suse.com + +- Update to upstream master (57eac84) + - reiserfsprogs: add helpers for constant endian routines + +------------------------------------------------------------------- Old: ---- reiserfsprogs-3.6.24-21-g19566d0.tar.bz2 New: ---- reiserfsprogs-3.6.24-22-g57eac84.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ reiserfs.spec ++++++ --- /var/tmp/diff_new_pack.3gv633/_old 2013-09-27 18:04:42.000000000 +0200 +++ /var/tmp/diff_new_pack.3gv633/_new 2013-09-27 18:04:42.000000000 +0200 @@ -26,7 +26,7 @@ Url: http://www.namesys.com/download.html Conflicts: libreiserfs-progs Supplements: filesystem(reiserfs) -%define tar_version 3.6.24-21-g19566d0 +%define tar_version 3.6.24-22-g57eac84 Version: 3.6.24 Release: 0 Summary: Reiser File System utilities ++++++ reiserfsprogs-3.6.24-21-g19566d0.tar.bz2 -> reiserfsprogs-3.6.24-22-g57eac84.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/reiserfsprogs-3.6.24-21-g19566d0/include/swab.h new/reiserfsprogs-3.6.24-22-g57eac84/include/swab.h --- old/reiserfsprogs-3.6.24-21-g19566d0/include/swab.h 2013-08-27 01:02:20.000000000 +0200 +++ new/reiserfsprogs-3.6.24-22-g57eac84/include/swab.h 2013-09-17 19:28:53.000000000 +0200 @@ -9,36 +9,43 @@ #include <endian.h> #include <linux/types.h> -#define __swab16(x) \ -({ \ - __u16 __x = (x); \ - ((__u16)( \ - (((__u16)(__x) & (__u16)0x00ffU) << 8) | \ - (((__u16)(__x) & (__u16)0xff00U) >> 8) )); \ +#define __constant_swab16(x) ((__u16)( \ + (((__u16)(x) & (__u16)0x00ffU) << 8) | \ + (((__u16)(x) & (__u16)0xff00U) >> 8) )) + +#define __swab16(x) \ +({ \ + __u16 __x = (x); \ + __constant_swab16(__x); \ }) -#define __swab32(x) \ -({ \ - __u32 __x = (x); \ - ((__u32)( \ - (((__u32)(__x) & (__u32)0x000000ffUL) << 24) | \ - (((__u32)(__x) & (__u32)0x0000ff00UL) << 8) | \ - (((__u32)(__x) & (__u32)0x00ff0000UL) >> 8) | \ - (((__u32)(__x) & (__u32)0xff000000UL) >> 24) )); \ +#define __constant_swab32(x) ((__u32)( \ + (((__u32)(x) & (__u32)0x000000ffUL) << 24) | \ + (((__u32)(x) & (__u32)0x0000ff00UL) << 8) | \ + (((__u32)(x) & (__u32)0x00ff0000UL) >> 8) | \ + (((__u32)(x) & (__u32)0xff000000UL) >> 24))) + +#define __swab32(x) \ +({ \ + __u32 __x = (x); \ + __constant_swab32(__x); \ }) -#define __swab64(x) \ -({ \ - __u64 __x = (x); \ - ((__u64)( \ - (__u64)(((__u64)(__x) & (__u64)0x00000000000000ffULL) << 56) | \ - (__u64)(((__u64)(__x) & (__u64)0x000000000000ff00ULL) << 40) | \ - (__u64)(((__u64)(__x) & (__u64)0x0000000000ff0000ULL) << 24) | \ - (__u64)(((__u64)(__x) & (__u64)0x00000000ff000000ULL) << 8) | \ - (__u64)(((__u64)(__x) & (__u64)0x000000ff00000000ULL) >> 8) | \ - (__u64)(((__u64)(__x) & (__u64)0x0000ff0000000000ULL) >> 24) | \ - (__u64)(((__u64)(__x) & (__u64)0x00ff000000000000ULL) >> 40) | \ - (__u64)(((__u64)(__x) & (__u64)0xff00000000000000ULL) >> 56) )); \ +#define __constant_swab64(x) ((__u64)( \ + (((__u64)(x) & (__u64)0x00000000000000ffULL) << 56) | \ + (((__u64)(x) & (__u64)0x000000000000ff00ULL) << 40) | \ + (((__u64)(x) & (__u64)0x0000000000ff0000ULL) << 24) | \ + (((__u64)(x) & (__u64)0x00000000ff000000ULL) << 8) | \ + (((__u64)(x) & (__u64)0x000000ff00000000ULL) >> 8) | \ + (((__u64)(x) & (__u64)0x0000ff0000000000ULL) >> 24) | \ + (((__u64)(x) & (__u64)0x00ff000000000000ULL) >> 40) | \ + (((__u64)(x) & (__u64)0xff00000000000000ULL) >> 56))) + + +#define __swab64(x) \ +({ \ + __u64 __x = (x); \ + __constant_swab64(__x); \ }) #ifndef le32_to_cpu @@ -56,6 +63,13 @@ #define cpu_to_le16(x) ((__force __le16)(__u16)(x)) #define le16_to_cpu(x) ((__force __u16)(__le16)(x)) +#define constant_cpu_to_le64(x) ((__force __le64)(__u64)(x)) +#define constant_le64_to_cpu(x) ((__force __u64)(__le64)(x)) +#define constant_cpu_to_le32(x) ((__force __le32)(__u32)(x)) +#define constant_le32_to_cpu(x) ((__force __u32)(__le32)(x)) +#define constant_cpu_to_le16(x) ((__force __le16)(__u16)(x)) +#define constant_le16_to_cpu(x) ((__force __u16)(__le16)(x)) + #elif __BYTE_ORDER == __BIG_ENDIAN #define cpu_to_le64(x) ((__force __le64)__swab64((x))) #define le64_to_cpu(x) __swab64((__force __u64)(__le64)(x)) @@ -64,6 +78,13 @@ #define cpu_to_le16(x) ((__force __le16)__swab16((x))) #define le16_to_cpu(x) __swab16((__force __u16)(__le16)(x)) +#define constant_cpu_to_le64(x) ((__force __le64)__constant_swab64((x))) +#define constant_le64_to_cpu(x) __constant_swab64((__force __u64)(__le64)(x)) +#define constant_cpu_to_le32(x) ((__force __le32)__constant_swab32((x))) +#define constant_le32_to_cpu(x) __constant_swab32((__force __u32)(__le32)(x)) +#define constant_cpu_to_le16(x) ((__force __le16)__constant_swab16((x))) +#define constant_le16_to_cpu(x) __constant_swab16((__force __u16)(__le16)(x)) + #else # error "nuxi/pdp-endian archs are not supported" #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/reiserfsprogs-3.6.24-21-g19566d0/reiserfscore/reiserfslib.c new/reiserfsprogs-3.6.24-22-g57eac84/reiserfscore/reiserfslib.c --- old/reiserfsprogs-3.6.24-21-g19566d0/reiserfscore/reiserfslib.c 2013-08-27 01:02:20.000000000 +0200 +++ new/reiserfsprogs-3.6.24-22-g57eac84/reiserfscore/reiserfslib.c 2013-09-17 19:28:53.000000000 +0200 @@ -13,8 +13,9 @@ struct reiserfs_key parent_root_dir_key = { 0, 0, {{0, 0},} }; struct reiserfs_key lost_found_dir_key = { 0, 0, {{0, 0},} }; static struct reiserfs_key badblock_key = - { cpu_to_le32(BADBLOCK_DIRID), cpu_to_le32(BADBLOCK_OBJID), - {{cpu_to_le32(0), cpu_to_le32(0)},} }; + { constant_cpu_to_le32(BADBLOCK_DIRID), + constant_cpu_to_le32(BADBLOCK_OBJID), + {{constant_cpu_to_le32(0), constant_cpu_to_le32(0)},} }; __u16 root_dir_format = 0; __u16 lost_found_dir_format = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/reiserfsprogs-3.6.24-21-g19566d0/reiserfscore/stree.c new/reiserfsprogs-3.6.24-22-g57eac84/reiserfscore/stree.c --- old/reiserfsprogs-3.6.24-21-g19566d0/reiserfscore/stree.c 2013-08-27 01:02:20.000000000 +0200 +++ new/reiserfsprogs-3.6.24-22-g57eac84/reiserfscore/stree.c 2013-09-17 19:28:53.000000000 +0200 @@ -174,13 +174,14 @@ /* Minimal possible key. It is never in the tree. */ const struct reiserfs_key MIN_KEY = - { cpu_to_le32(0), cpu_to_le32(0), - {{cpu_to_le32(0), cpu_to_le32(0)},} }; + { constant_cpu_to_le32(0), constant_cpu_to_le32(0), + {{constant_cpu_to_le32(0), constant_cpu_to_le32(0)},} }; /* Maximal possible key. It is never in the tree. */ const struct reiserfs_key MAX_KEY = - { cpu_to_le32(0xffffffff), cpu_to_le32(0xffffffff), - {{cpu_to_le32(0xffffffff), cpu_to_le32(0xffffffff)},} }; + { constant_cpu_to_le32(0xffffffff), constant_cpu_to_le32(0xffffffff), + {{constant_cpu_to_le32(0xffffffff), + constant_cpu_to_le32(0xffffffff)},} }; /* Get delimiting key of the buffer by looking for it in the buffers in the path, starting from the bottom of the path, and going upwards. We must -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
