summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorAlexander Viro <viro@math.psu.edu>2002-04-24 23:51:04 -0700
committerLinus Torvalds <torvalds@penguin.transmeta.com>2002-04-24 23:51:04 -0700
commit90012e6ec7ead7a4374f86d03ff09c4d14b41ebe (patch)
tree8a57242fa5f17fb284081a671a0ff8c276376adb /fs
parent61e3b7fcb0a88fb82e93b9b5c384ae70e293ded7 (diff)
[PATCH] (13/15) big struct block_device * push (first series)
- *NOW* all places that (re)assign ->bi_dev have relevant struct block_device *. ->bi_bdev (struct block_device * equivalent of ->bi_dev) introduced, ->bi_dev removed, users updated.
Diffstat (limited to 'fs')
-rw-r--r--fs/bio.c6
-rw-r--r--fs/jfs/jfs_logmgr.c4
2 files changed, 5 insertions, 5 deletions
diff --git a/fs/bio.c b/fs/bio.c
index 4a3dde467b9a..5181ecf38bdc 100644
--- a/fs/bio.c
+++ b/fs/bio.c
@@ -202,7 +202,7 @@ inline void __bio_clone(struct bio *bio, struct bio *bio_src)
bio->bi_io_vec = bio_src->bi_io_vec;
bio->bi_sector = bio_src->bi_sector;
- bio->bi_dev = bio_src->bi_dev;
+ bio->bi_bdev = bio_src->bi_bdev;
bio->bi_flags |= 1 << BIO_CLONED;
bio->bi_rw = bio_src->bi_rw;
@@ -300,7 +300,7 @@ struct bio *bio_copy(struct bio *bio, int gfp_mask, int copy)
}
b->bi_sector = bio->bi_sector;
- b->bi_dev = bio->bi_dev;
+ b->bi_bdev = bio->bi_bdev;
b->bi_rw = bio->bi_rw;
b->bi_vcnt = bio->bi_vcnt;
@@ -383,7 +383,7 @@ next_chunk:
}
bio->bi_sector = sector;
- bio->bi_dev = dev;
+ bio->bi_bdev = bdev;
bio->bi_idx = 0;
bio->bi_end_io = bio_end_io_kio;
bio->bi_private = kio;
diff --git a/fs/jfs/jfs_logmgr.c b/fs/jfs/jfs_logmgr.c
index 579b98ceb2d5..b774b32760bf 100644
--- a/fs/jfs/jfs_logmgr.c
+++ b/fs/jfs/jfs_logmgr.c
@@ -1773,7 +1773,7 @@ static int lbmRead(log_t * log, int pn, lbuf_t ** bpp)
bio = bio_alloc(GFP_NOFS, 1);
bio->bi_sector = bp->l_blkno << (log->l2bsize - 9);
- bio->bi_dev = to_kdev_t(log->bdev->bd_dev);
+ bio->bi_bdev = log->bdev;
bio->bi_io_vec[0].bv_page = virt_to_page(bp->l_ldata);
bio->bi_io_vec[0].bv_len = LOGPSIZE;
bio->bi_io_vec[0].bv_offset = 0;
@@ -1915,7 +1915,7 @@ void lbmStartIO(lbuf_t * bp)
bio = bio_alloc(GFP_NOFS, 1);
bio->bi_sector = bp->l_blkno << (log->l2bsize - 9);
- bio->bi_dev = to_kdev_t(log->bdev->bd_dev);
+ bio->bi_bdev = log->bdev;
bio->bi_io_vec[0].bv_page = virt_to_page(bp->l_ldata);
bio->bi_io_vec[0].bv_len = LOGPSIZE;
bio->bi_io_vec[0].bv_offset = 0;