| 1 |
ryao 12/07/10 00:31:39 |
| 2 |
|
| 3 |
Added: zfs-0.6.0_rc9-fix-32-bit-warnings.patch |
| 4 |
Log: |
| 5 |
Fix 32-bit compiler warnings and remove push page patch in favor of change to sys-fs/spl |
| 6 |
|
| 7 |
(Portage version: 2.1.10.65/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sys-fs/zfs/files/zfs-0.6.0_rc9-fix-32-bit-warnings.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/files/zfs-0.6.0_rc9-fix-32-bit-warnings.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/files/zfs-0.6.0_rc9-fix-32-bit-warnings.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: zfs-0.6.0_rc9-fix-32-bit-warnings.patch |
| 16 |
=================================================================== |
| 17 |
From 99aa2c28b1c96de2feee9a8edcbbe101100029c2 Mon Sep 17 00:00:00 2001 |
| 18 |
From: Richard Yao <ryao@×××××××××××××.edu> |
| 19 |
Date: Mon, 9 Jul 2012 19:41:28 -0400 |
| 20 |
Subject: [PATCH] Use ULL suffix in constants |
| 21 |
|
| 22 |
The lack of the ULL suffix causes warnings such as the following on |
| 23 |
32-bit systems: |
| 24 |
|
| 25 |
In function 'zfsctl_is_snapdir': |
| 26 |
zfs-0.6.0//module/zfs/zfs_ctldir.c:151: warning: integer constant is too |
| 27 |
large for 'long' type |
| 28 |
|
| 29 |
We add the ULL suffix to fix that. |
| 30 |
|
| 31 |
This closes issue #813. |
| 32 |
|
| 33 |
Signed-off-by: Richard Yao <ryao@×××××××××××××.edu> |
| 34 |
--- |
| 35 |
include/sys/zfs_ctldir.h | 8 ++++---- |
| 36 |
1 file changed, 4 insertions(+), 4 deletions(-) |
| 37 |
|
| 38 |
diff --git a/include/sys/zfs_ctldir.h b/include/sys/zfs_ctldir.h |
| 39 |
index e598529..0a3c142 100644 |
| 40 |
--- a/include/sys/zfs_ctldir.h |
| 41 |
+++ b/include/sys/zfs_ctldir.h |
| 42 |
@@ -103,10 +103,10 @@ extern int zfsctl_shares_lookup(struct inode *dip, char *name, |
| 43 |
* However, they should be as large as possible to avoid conflicts |
| 44 |
* with the objects which are assigned monotonically by the dmu. |
| 45 |
*/ |
| 46 |
-#define ZFSCTL_INO_ROOT 0x0000FFFFFFFFFFFF |
| 47 |
-#define ZFSCTL_INO_SHARES 0x0000FFFFFFFFFFFE |
| 48 |
-#define ZFSCTL_INO_SNAPDIR 0x0000FFFFFFFFFFFD |
| 49 |
-#define ZFSCTL_INO_SNAPDIRS 0x0000FFFFFFFFFFFC |
| 50 |
+#define ZFSCTL_INO_ROOT 0x0000FFFFFFFFFFFFULL |
| 51 |
+#define ZFSCTL_INO_SHARES 0x0000FFFFFFFFFFFEULL |
| 52 |
+#define ZFSCTL_INO_SNAPDIR 0x0000FFFFFFFFFFFDULL |
| 53 |
+#define ZFSCTL_INO_SNAPDIRS 0x0000FFFFFFFFFFFCULL |
| 54 |
|
| 55 |
#define ZFSCTL_EXPIRE_SNAPSHOT 300 |
| 56 |
|
| 57 |
-- |
| 58 |
1.7.10 |
Archives