X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=fs%2Fdirect-io.c;h=8b10b87dc01a294845aac2afd1a2d22ae5a269b2;hb=cf6e693212263d33c5882e4653df89a2fca4c0c4;hp=da258e7249cc718b8a46ddec08ba04a62e7e4790;hpb=aeb6fafb8fa53266d70ca7474fcda2bdaf96524a;p=safe%2Fjmp%2Flinux-2.6

diff --git a/fs/direct-io.c b/fs/direct-io.c
index da258e7..8b10b87 100644
--- a/fs/direct-io.c
+++ b/fs/direct-io.c
@@ -307,8 +307,6 @@ dio_bio_alloc(struct dio *dio, struct block_device *bdev,
 	struct bio *bio;
 
 	bio = bio_alloc(GFP_KERNEL, nr_vecs);
-	if (bio == NULL)
-		return -ENOMEM;
 
 	bio->bi_bdev = bdev;
 	bio->bi_sector = first_sector;
@@ -1129,7 +1127,7 @@ __blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode,
 		rw = WRITE_ODIRECT;
 
 	if (bdev)
-		bdev_blkbits = blksize_bits(bdev_hardsect_size(bdev));
+		bdev_blkbits = blksize_bits(bdev_logical_block_size(bdev));
 
 	if (offset & blocksize_mask) {
 		if (bdev)