diff options
| author | Ying Zhu <[email protected]> | 2013-06-15 22:25:48 +0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2013-06-19 17:11:55 -0700 |
| commit | 6822a0d0582f580a21f70615f29ffe2869be8265 (patch) | |
| tree | 1394a5841cc982172ef8c1302fbc4644facfe158 | |
| parent | e51be06697762215dc3b679f8668987034a5a048 (diff) | |
Fix compile warning on 32-bit systems
The definition of zfs_vdev_holder casts VDEV_HOLDER into a function pointer
passing to linux kernel's block layer function blkdev_get_by_path.
However current VDEV_HOLDER is defined to be wider than 32 bits and the compiler
warns about potential overflows. Instead of specifying different values for 32-bit and
64-bit systems using ifdefs, choose the common factor 32-bit addresses.
Redefine VDEV_HOLDER to 0x2401de7("zholder") here.
Signed-off-by: Ying Zhu <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #1520
| -rw-r--r-- | include/linux/blkdev_compat.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/blkdev_compat.h b/include/linux/blkdev_compat.h index 47f569bbd..ec9926ffd 100644 --- a/include/linux/blkdev_compat.h +++ b/include/linux/blkdev_compat.h @@ -485,6 +485,6 @@ blk_queue_discard_granularity(struct request_queue *q, unsigned int dg) * user space processes which don't pass this value will get EBUSY. This is * currently required for the correct operation of hot spares. */ -#define VDEV_HOLDER ((void *)0x2f5401de7) +#define VDEV_HOLDER ((void *)0x2401de7) #endif /* _ZFS_BLKDEV_H */ |