From 6822a0d0582f580a21f70615f29ffe2869be8265 Mon Sep 17 00:00:00 2001 From: Ying Zhu Date: Sat, 15 Jun 2013 22:25:48 +0800 Subject: [PATCH] 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 Signed-off-by: Brian Behlendorf Closes #1520 --- include/linux/blkdev_compat.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/blkdev_compat.h b/include/linux/blkdev_compat.h index 47f569b..ec9926f 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 */ -- 1.8.3.1