Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch

This commit is contained in:
Brian Behlendorf 2009-12-23 14:52:18 -08:00
parent 3625296c5b 10dbda27b6
commit d711dc6b34
4 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
config/kernel-fmode-t.m4 Normal file
View File

@ -0,0 +1,18 @@
dnl #
dnl # 2.6.28 API change,
dnl # check if fmode_t typedef is defined
dnl #
AC_DEFUN([ZFS_AC_KERNEL_TYPE_FMODE_T],
[AC_MSG_CHECKING([whether kernel defines fmode_t])
ZFS_LINUX_TRY_COMPILE([
#include <linux/types.h>
],[
fmode_t *ptr;
],[
AC_MSG_RESULT([yes])
AC_DEFINE(HAVE_FMODE_T, 1,
[kernel defines fmode_t])
],[
AC_MSG_RESULT([no])
])
])

1
config/kernel.m4
View File

@ -5,6 +5,7 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
ZFS_AC_KERNEL ZFS_AC_KERNEL
ZFS_AC_SPL ZFS_AC_SPL
ZFS_AC_KERNEL_BDEV_BLOCK_DEVICE_OPERATIONS ZFS_AC_KERNEL_BDEV_BLOCK_DEVICE_OPERATIONS
ZFS_AC_KERNEL_TYPE_FMODE_T
ZFS_AC_KERNEL_OPEN_BDEV_EXCLUSIVE ZFS_AC_KERNEL_OPEN_BDEV_EXCLUSIVE
ZFS_AC_KERNEL_INVALIDATE_BDEV_ARGS ZFS_AC_KERNEL_INVALIDATE_BDEV_ARGS
ZFS_AC_KERNEL_BDEV_LOGICAL_BLOCK_SIZE ZFS_AC_KERNEL_BDEV_LOGICAL_BLOCK_SIZE

4
module/zfs/include/sys/blkdev.h
View File

@ -7,6 +7,10 @@
#include <linux/elevator.h> #include <linux/elevator.h>
#include "zfs_config.h" #include "zfs_config.h"
#ifndef HAVE_FMODE_T
typedef unsigned __bitwise__ fmode_t;
#endif /* HAVE_FMODE_T */
#ifndef HAVE_BLK_FETCH_REQUEST #ifndef HAVE_BLK_FETCH_REQUEST
static inline struct request * static inline struct request *
blk_fetch_request(struct request_queue *q) blk_fetch_request(struct request_queue *q)

4
module/zfs/zvol.c
View File

@ -681,10 +681,6 @@ zvol_remove(zvol_state_t *zv_remove)
list_remove(&zvol_state_list, 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 static int
zvol_open(struct block_device *bdev, fmode_t flag) zvol_open(struct block_device *bdev, fmode_t flag)
{ {