From fd9a7a0fb423053e7ddfd7229c70b714d62554dd Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Sun, 22 Feb 2009 02:07:33 +0000 Subject: [PATCH 1/2] Add 'ull' suffix to 64-bit constants. --- .topdeps | 1 + .topmsg | 3 +++ cmd/ztest/ztest.c | 2 +- module/zfs/include/sys/zfs_znode.h | 22 +++++++++++----------- 4 files changed, 16 insertions(+), 12 deletions(-) create mode 100644 .topdeps create mode 100644 .topmsg diff --git a/.topdeps b/.topdeps new file mode 100644 index 0000000000..1f7391f92b --- /dev/null +++ b/.topdeps @@ -0,0 +1 @@ +master diff --git a/.topmsg b/.topmsg new file mode 100644 index 0000000000..81bb126e8b --- /dev/null +++ b/.topmsg @@ -0,0 +1,3 @@ +From: Ricardo M. Correia +Subject: Add 'ull' suffix to 64-bit constants. + diff --git a/cmd/ztest/ztest.c b/cmd/ztest/ztest.c index 4503a3d028..8a71ca1845 100644 --- a/cmd/ztest/ztest.c +++ b/cmd/ztest/ztest.c @@ -2495,7 +2495,7 @@ ztest_fault_inject(ztest_args_t *za) int fd; uint64_t offset; uint64_t leaves = MAX(zopt_mirrors, 1) * zopt_raidz; - 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 9192abcd76..593e3b9160 100644 --- a/module/zfs/include/sys/zfs_znode.h +++ b/module/zfs/include/sys/zfs_znode.h @@ -46,17 +46,17 @@ 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_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_ATTR_SET(zp, attr, value) \ { \ From dc51585df7d811a4b63fb3a23db39c991472f4a7 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Wed, 11 Mar 2009 10:32:42 -0700 Subject: [PATCH 2/2] New TopGit dependency: gcc-64bit-constants --- .topdeps | 1 + 1 file changed, 1 insertion(+) diff --git a/.topdeps b/.topdeps index e3260fcb05..dbb33d5b05 100644 --- a/.topdeps +++ b/.topdeps @@ -8,3 +8,4 @@ gcc-no-parenthesis gcc-uninit gcc-unused gcc-shadow +gcc-64bit-constants