From 9345a0c1a081d3d0eb280689adaa2191c28d37b2 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Wed, 23 Dec 2009 14:45:04 -0800 Subject: [PATCH] Using autoconf check define fmode_t typedef if undefined. --- module/zfs/include/sys/blkdev.h | 4 ++++ module/zfs/zvol.c | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/module/zfs/include/sys/blkdev.h b/module/zfs/include/sys/blkdev.h index 19ded8b6ba..9ad184b3ea 100644 --- a/module/zfs/include/sys/blkdev.h +++ b/module/zfs/include/sys/blkdev.h @@ -7,6 +7,10 @@ #include #include "zfs_config.h" +#ifndef HAVE_FMODE_T +typedef unsigned __bitwise__ fmode_t; +#endif /* HAVE_FMODE_T */ + #ifndef HAVE_BLK_FETCH_REQUEST static inline struct request * blk_fetch_request(struct request_queue *q) diff --git a/module/zfs/zvol.c b/module/zfs/zvol.c index af64f59349..2db17aed26 100644 --- a/module/zfs/zvol.c +++ b/module/zfs/zvol.c @@ -681,10 +681,6 @@ zvol_remove(zvol_state_t *zv_remove) list_remove(&zvol_state_list, zv_remove); } -#ifndef HAVE_BDEV_BLOCK_DEVICE_OPERATIONS -typedef unsigned __bitwise__ fmode_t; -#endif /* HAVE_BDEV_BLOCK_DEVICE_OPERATIONS */ - static int zvol_open(struct block_device *bdev, fmode_t flag) {