The member bi_bdev is replaced by bi_disk in struct bio.
- upstream commit:
74d46992e0d9dee7f1f376de0d56d31614c8a17a
block: replace bi_bdev with a gendisk pointer and partitions index
Signed-off-by: Yang Sheng <yang.sheng@intel.com>
Change-Id: Ice1fb53f8371fb744af5dbac6c076ce817770213
Reviewed-on: https://review.whamcloud.com/31975
Tested-by: Jenkins
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: James Simmons <uja.ornl@yahoo.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
/* struct dirent64 */
#include <linux/dirent.h>
#include <linux/statfs.h>
+#include <linux/bio.h>
#include <ldiskfs/ldiskfs.h>
#include <ldiskfs/ldiskfs_jbd2.h>
return bh;
}
+#ifndef bio_set_dev
+# define bio_set_dev(bio, bdev) ((bio)->bi_bdev = bdev)
+# define bio_get_queue(bio) bdev_get_queue((bio)->bi_bdev)
+#else
+# define bio_get_queue(bio) ((bio)->bi_disk->queue)
+#endif
+
void ldiskfs_inc_count(handle_t *handle, struct inode *inode);
void ldiskfs_dec_count(handle_t *handle, struct inode *inode);
continue; /* added this frag OK */
if (bio != NULL) {
- struct request_queue *q =
- bdev_get_queue(bio->bi_bdev);
+ struct request_queue *q = bio_get_queue(bio);
unsigned int bi_size = bio_sectors(bio) << 9;
/* Dang! I have to fragment this I/O */
goto out;
}
- bio->bi_bdev = inode->i_sb->s_bdev;
+ bio_set_dev(bio, inode->i_sb->s_bdev);
bio_set_sector(bio, sector);
#ifdef HAVE_BI_RW
bio->bi_rw = (iobuf->dr_rw == 0) ? READ : WRITE;