diff options
| author | Alexander Viro <viro@math.psu.edu> | 2002-04-30 19:58:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-04-30 19:58:03 -0700 |
| commit | a9e3cad6d153a0802946d0d9cc3b8f66eade3373 (patch) | |
| tree | 7cb8bd6bde41dd305d6c693013bc5b247fceebe7 /include/linux/blkdev.h | |
| parent | ec769fb0caa2c525910e06f679b546a9a3e75a89 (diff) | |
[PATCH] (4/6) blksize_size[] removal
- put block size in bdev->bd_block_size, make do_open() and
check_partition() to set it (see above), switch set_blocksize() and
block_size() to use of ->bd_block_size. Remove manipulations with
blksize_size[] from drivers, remove blksize_size[] itself.
Diffstat (limited to 'include/linux/blkdev.h')
| -rw-r--r-- | include/linux/blkdev.h | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 2bb86494e555..f747fb405f01 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -317,7 +317,6 @@ extern void blk_dump_rq_flags(struct request *, char *); extern void generic_unplug_device(void *); extern int * blk_size[MAX_BLKDEV]; /* in units of 1024 bytes */ -extern int * blksize_size[MAX_BLKDEV]; #define MAX_PHYS_SEGMENTS 128 #define MAX_HW_SEGMENTS 128 @@ -335,7 +334,6 @@ extern inline void blk_clear(int major) #if 0 blk_size_in_bytes[major] = NULL; #endif - blksize_size[major] = NULL; } extern inline int queue_hardsect_size(request_queue_t *q) @@ -374,16 +372,7 @@ extern inline unsigned int blksize_bits(unsigned int size) extern inline unsigned int block_size(struct block_device *bdev) { - int retval = BLOCK_SIZE; - kdev_t dev = to_kdev_t(bdev->bd_dev); - int major = major(dev); - - if (blksize_size[major]) { - int minor = minor(dev); - if (blksize_size[major][minor]) - retval = blksize_size[major][minor]; - } - return retval; + return bdev->bd_block_size; } static inline loff_t blkdev_size_in_bytes(kdev_t dev) |