diff options
| author | Alexander Viro <viro@math.psu.edu> | 2002-04-24 23:51:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@penguin.transmeta.com> | 2002-04-24 23:51:13 -0700 |
| commit | ea3944947f3f8fde8a8c292ddf1558eab74dd03d (patch) | |
| tree | bbebea03f288d4e784e2043551fdaa5874d272b9 /include/linux/fs.h | |
| parent | 90012e6ec7ead7a4374f86d03ff09c4d14b41ebe (diff) | |
[PATCH] (14/15) big struct block_device * push (first series)
- bdevname() switched to struct block_device *. Old variant (taking
kdev_t) renamed to __bdevname() (very few callers remain). This
allow to drop ->b_dev conveniently - it's duplicated by ->b_bdev
and most of remaining users were bdevname(bh->b_dev) in various
places.
Diffstat (limited to 'include/linux/fs.h')
| -rw-r--r-- | include/linux/fs.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 7a05fbe4b64c..c3b34e289796 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -244,7 +244,6 @@ struct buffer_head { sector_t b_blocknr; /* block number */ unsigned short b_size; /* block size */ unsigned short b_list; /* List that this buffer appears */ - kdev_t b_dev; /* device (B_FREE = free) */ struct block_device *b_bdev; atomic_t b_count; /* users using this block */ @@ -1192,7 +1191,11 @@ extern const struct block_device_operations *get_blkfops(unsigned int); extern int register_chrdev(unsigned int, const char *, struct file_operations *); extern int unregister_chrdev(unsigned int, const char *); extern int chrdev_open(struct inode *, struct file *); -extern const char * bdevname(kdev_t); +extern const char *__bdevname(kdev_t); +extern inline const char *bdevname(struct block_device *bdev) +{ + return __bdevname(to_kdev_t(bdev->bd_dev)); +} extern const char * cdevname(kdev_t); extern const char * kdevname(kdev_t); extern void init_special_inode(struct inode *, umode_t, int); @@ -1462,7 +1465,7 @@ static inline struct buffer_head * get_hash_table(kdev_t dev, sector_t block, in struct buffer_head *bh; bdev = bdget(kdev_t_to_nr(dev)); if (!bdev) { - printk("No block device for %s\n", bdevname(dev)); + printk("No block device for %s\n", __bdevname(dev)); BUG(); } bh = __get_hash_table(bdev, block, size); @@ -1476,7 +1479,7 @@ static inline struct buffer_head * getblk(kdev_t dev, sector_t block, int size) struct buffer_head *bh; bdev = bdget(kdev_t_to_nr(dev)); if (!bdev) { - printk("No block device for %s\n", bdevname(dev)); + printk("No block device for %s\n", __bdevname(dev)); BUG(); } bh = __getblk(bdev, block, size); @@ -1510,7 +1513,7 @@ static inline struct buffer_head * bread(kdev_t dev, int block, int size) struct buffer_head *bh; bdev = bdget(kdev_t_to_nr(dev)); if (!bdev) { - printk("No block device for %s\n", bdevname(dev)); + printk("No block device for %s\n", __bdevname(dev)); BUG(); } bh = __bread(bdev, block, size); @@ -1533,7 +1536,6 @@ static inline void map_bh(struct buffer_head *bh, struct super_block *sb, int bl { bh->b_state |= 1 << BH_Mapped; bh->b_bdev = sb->s_bdev; - bh->b_dev = sb->s_dev; bh->b_blocknr = block; } extern void wakeup_bdflush(void); |