diff options
| author | Ricardo M. Correia <[email protected]> | 2010-08-26 09:52:39 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2010-08-26 15:18:01 -0700 |
| commit | c5b3a7bbcc321846bb15ff73c6fd6f1c483b6aa6 (patch) | |
| tree | 13dbcada2efd02b5bc9ca39fe2d50c9904200351 | |
| parent | 572e285762521df27fe5b026f409ba1a21abb7ac (diff) | |
Fix gcc 64-bit constant warnings
Add 'ull' suffix to 64-bit constants.
Signed-off-by: Brian Behlendorf <[email protected]>
| -rw-r--r-- | cmd/ztest/ztest.c | 2 | ||||
| -rw-r--r-- | module/zfs/include/sys/zfs_znode.h | 28 | ||||
| -rw-r--r-- | module/zfs/vdev_raidz.c | 2 |
3 files changed, 16 insertions, 16 deletions
diff --git a/cmd/ztest/ztest.c b/cmd/ztest/ztest.c index b2d81b558..46d3410e3 100644 --- a/cmd/ztest/ztest.c +++ b/cmd/ztest/ztest.c @@ -4399,7 +4399,7 @@ ztest_fault_inject(ztest_ds_t *zd, uint64_t id) int fd; uint64_t offset; uint64_t leaves; - uint64_t bad = 0x1990c0ffeedecade; + uint64_t bad = 0x1990c0ffeedecadeull; uint64_t top, leaf; char path0[MAXPATHLEN]; char pathrand[MAXPATHLEN]; diff --git a/module/zfs/include/sys/zfs_znode.h b/module/zfs/include/sys/zfs_znode.h index 3e9621a0e..7fa7a0ae9 100644 --- a/module/zfs/include/sys/zfs_znode.h +++ b/module/zfs/include/sys/zfs_znode.h @@ -48,20 +48,20 @@ extern "C" { * Additional file level attributes, that are stored * in the upper half of zp_flags */ -#define ZFS_READONLY 0x0000000100000000 -#define ZFS_HIDDEN 0x0000000200000000 -#define ZFS_SYSTEM 0x0000000400000000 -#define ZFS_ARCHIVE 0x0000000800000000 -#define ZFS_IMMUTABLE 0x0000001000000000 -#define ZFS_NOUNLINK 0x0000002000000000 -#define ZFS_APPENDONLY 0x0000004000000000 -#define ZFS_NODUMP 0x0000008000000000 -#define ZFS_OPAQUE 0x0000010000000000 -#define ZFS_AV_QUARANTINED 0x0000020000000000 -#define ZFS_AV_MODIFIED 0x0000040000000000 -#define ZFS_REPARSE 0x0000080000000000 -#define ZFS_OFFLINE 0x0000100000000000 -#define ZFS_SPARSE 0x0000200000000000 +#define ZFS_READONLY 0x0000000100000000ull +#define ZFS_HIDDEN 0x0000000200000000ull +#define ZFS_SYSTEM 0x0000000400000000ull +#define ZFS_ARCHIVE 0x0000000800000000ull +#define ZFS_IMMUTABLE 0x0000001000000000ull +#define ZFS_NOUNLINK 0x0000002000000000ull +#define ZFS_APPENDONLY 0x0000004000000000ull +#define ZFS_NODUMP 0x0000008000000000ull +#define ZFS_OPAQUE 0x0000010000000000ull +#define ZFS_AV_QUARANTINED 0x0000020000000000ull +#define ZFS_AV_MODIFIED 0x0000040000000000ull +#define ZFS_REPARSE 0x0000080000000000ull +#define ZFS_OFFLINE 0x0000100000000000ull +#define ZFS_SPARSE 0x0000200000000000ull #define ZFS_ATTR_SET(zp, attr, value, pflags, tx) \ { \ diff --git a/module/zfs/vdev_raidz.c b/module/zfs/vdev_raidz.c index 4b0f5602c..526385e01 100644 --- a/module/zfs/vdev_raidz.c +++ b/module/zfs/vdev_raidz.c @@ -143,7 +143,7 @@ typedef struct raidz_map { (mask) = (x) & 0x8080808080808080ULL; \ (mask) = ((mask) << 1) - ((mask) >> 7); \ (x) = (((x) << 1) & 0xfefefefefefefefeULL) ^ \ - ((mask) & 0x1d1d1d1d1d1d1d1d); \ + ((mask) & 0x1d1d1d1d1d1d1d1dULL); \ } #define VDEV_RAIDZ_64MUL_4(x, mask) \ |