[PATCH] (5/6) blksize_size[] removal

 - kill bread()/getblk()/get_hash_table() (kdev_t-using wrappers; struct
   block_device * counterparts are obviously still alive).

diff --git a/fs/buffer.c b/fs/buffer.c
index 2fda0396498a9f89c7b5e11a27fe82dd507a9b0b..892136cce71244799884779aca6bd7ed74cea110 100644 (file)
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -439,21 +439,6 @@ out:
        return ret;
 }
 
-struct buffer_head *get_hash_table(kdev_t dev, sector_t block, int size)
-{
-       struct block_device *bdev;
-       struct buffer_head *bh;
-       bdev = bdget(kdev_t_to_nr(dev));
-       if (!bdev) {
-               printk("No block device for %s\n", __bdevname(dev));
-               BUG();
-       }
-       bh = __get_hash_table(bdev, block, size);
-       atomic_dec(&bdev->bd_count);
-       return bh;
-}
-EXPORT_SYMBOL(get_hash_table);
-
 void buffer_insert_list(spinlock_t *lock,
                struct buffer_head *bh, struct list_head *list)
 {
@@ -988,21 +973,6 @@ __getblk(struct block_device *bdev, sector_t block, int size)
        }
 }
 
-struct buffer_head *getblk(kdev_t dev, sector_t block, int size)
-{
-       struct block_device *bdev;
-       struct buffer_head *bh;
-       bdev = bdget(kdev_t_to_nr(dev));
-       if (!bdev) {
-               printk("No block device for %s\n", __bdevname(dev));
-               BUG();
-       }
-       bh = __getblk(bdev, block, size);
-       atomic_dec(&bdev->bd_count);
-       return bh;
-}
-EXPORT_SYMBOL(getblk);
-
 /*
  * The relationship between dirty buffers and dirty pages:
  *
@@ -1071,7 +1041,7 @@ void __bforget(struct buffer_head * buf)
 }
 
 /**
- *  bread() - reads a specified block and returns the bh
+ *  __bread() - reads a specified block and returns the bh
  *  @block: number of block
  *  @size: size (in bytes) to read
  * 
@@ -1102,21 +1072,6 @@ struct buffer_head * __bread(struct block_device *bdev, int block, int size)
        return NULL;
 }
 
-struct buffer_head *bread(kdev_t dev, int block, int size)
-{
-       struct block_device *bdev;
-       struct buffer_head *bh;
-       bdev = bdget(kdev_t_to_nr(dev));
-       if (!bdev) {
-               printk("No block device for %s\n", __bdevname(dev));
-               BUG();
-       }
-       bh = __bread(bdev, block, size);
-       atomic_dec(&bdev->bd_count);
-       return bh;
-}
-EXPORT_SYMBOL(bread);
-
 void set_bh_page(struct buffer_head *bh,
                struct page *page, unsigned long offset)
 {

diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h
index f9158122b3f7b09edf6b2d22ea71dc697c69d645..80f6e106d723223fec71e2de891855f4981f736d 100644 (file)
--- a/include/linux/buffer_head.h
+++ b/include/linux/buffer_head.h
@@ -151,10 +151,6 @@ void create_empty_buffers(struct page *, unsigned long,
 void end_buffer_io_sync(struct buffer_head *bh, int uptodate);
 void buffer_insert_list(spinlock_t *lock,
                        struct buffer_head *, struct list_head *);
-struct buffer_head *get_hash_table(kdev_t dev, sector_t block, int size);
-struct buffer_head *getblk(kdev_t dev, sector_t block, int size);
-struct buffer_head *bread(kdev_t dev, int block, int size);
-
 
 /* reiserfs_writepage needs this */
 void set_buffer_async_io(struct buffer_head *bh);