Use ULL suffix in constants
authorRichard Yao <ryao@cs.stonybrook.edu>
Mon, 9 Jul 2012 23:41:28 +0000 (19:41 -0400)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Tue, 10 Jul 2012 18:31:55 +0000 (11:31 -0700)
The lack of the ULL suffix causes warnings such as the following on
32-bit systems:

  In function 'zfsctl_is_snapdir':
  zfs-0.6.0//module/zfs/zfs_ctldir.c:151: warning: integer constant
  is too large for 'long' type

We add the ULL suffix to fix that.

Signed-off-by: Richard Yao <ryao@cs.stonybrook.edu>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #813

include/sys/zfs_ctldir.h

index e598529..0a3c142 100644 (file)
@@ -103,10 +103,10 @@ extern void zfsctl_fini(void);
  * However, they should be as large as possible to avoid conflicts
  * with the objects which are assigned monotonically by the dmu.
  */
-#define        ZFSCTL_INO_ROOT         0x0000FFFFFFFFFFFF
-#define        ZFSCTL_INO_SHARES       0x0000FFFFFFFFFFFE
-#define        ZFSCTL_INO_SNAPDIR      0x0000FFFFFFFFFFFD
-#define        ZFSCTL_INO_SNAPDIRS     0x0000FFFFFFFFFFFC
+#define        ZFSCTL_INO_ROOT         0x0000FFFFFFFFFFFFULL
+#define        ZFSCTL_INO_SHARES       0x0000FFFFFFFFFFFEULL
+#define        ZFSCTL_INO_SNAPDIR      0x0000FFFFFFFFFFFDULL
+#define        ZFSCTL_INO_SNAPDIRS     0x0000FFFFFFFFFFFCULL
 
 #define        ZFSCTL_EXPIRE_SNAPSHOT  300