fix O_DIRECT oops

PATCH New Andrew Morton 1 participant 1 message Jul 7, 2002 VFS

lore

Share & tools

lore

Andrew Morton

author

2002-07-07 23:01 UTC #0 lore raw

PATCH 1/1 fix O_DIRECT oops

inode->i_sb->s_bdev is NULL when the inode refers to a blockdev. Use the get_block() result instead.

 buffer.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

fs/buffer.c renamed from fs/buffer.c~direct_io-fix +5 -3

@@ -2302,8 +2302,9 @@ int generic_direct_IO(int rw, struct ino
 			struct kiobuf *iobuf, unsigned long blocknr,
 			int blocksize, get_block_t *get_block)
 {
-	int i, nr_blocks, retval;
+	int i, nr_blocks, retval = 0;
 	sector_t *blocks = iobuf->blocks;
+	struct block_device *bdev = NULL;
 
 	nr_blocks = iobuf->length / blocksize;
 	/* build the blocklist */

@@ -2333,11 +2334,12 @@ int generic_direct_IO(int rw, struct ino
 				BUG();
 		}
 		blocks[i] = bh.b_blocknr;
+		bdev = bh.b_bdev;
 	}
 
 	/* This does not understand multi-device filesystems currently */
-	retval = brw_kiovec(rw, 1, &iobuf,
-			inode->i_sb->s_bdev, blocks, blocksize);
+	if (bdev)
+		retval = brw_kiovec(rw, 1, &iobuf, bdev, blocks, blocksize);
 
  out:
 	return retval;