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 <casualfisher@gmail.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #1520
This commit is contained in:
Ying Zhu 2013-06-15 22:25:48 +08:00 committed by Brian Behlendorf
parent e51be06697
commit 6822a0d058

View File

@ -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 * user space processes which don't pass this value will get EBUSY. This is
* currently required for the correct operation of hot spares. * currently required for the correct operation of hot spares.
*/ */
#define VDEV_HOLDER ((void *)0x2f5401de7) #define VDEV_HOLDER ((void *)0x2401de7)
#endif /* _ZFS_BLKDEV_H */ #endif /* _ZFS_BLKDEV_H */