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

Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2009-12-23 14:50:47 -08:00
parent db7df86150 902658431e
commit 821cec7046
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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)
{ {