diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2003-04-29 17:35:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2003-04-29 17:35:12 -0700 |
| commit | 2bb1ff4c9921f155a35bc7f1f60784d9d20ef65a (patch) | |
| tree | 02d6fa684a0dabb070292f1c2f96c31a842ca9b4 /include/linux/fs.h | |
| parent | d27dca137ba79fcf657f7ee88beff915db456f40 (diff) | |
| parent | 5650a43bfd5ca6aafa4f279e1f146459697a05b4 (diff) | |
Merge bk://kernel.bkbits.net/davem/net-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include/linux/fs.h')
| -rw-r--r-- | include/linux/fs.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 572b92e6f443..b9b2cf5b69e8 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1068,10 +1068,7 @@ extern int chrdev_open(struct inode *, struct file *); /* fs/block_dev.c */ #define BDEVNAME_SIZE 32 /* Largest string for a blockdev identifier */ extern const char *__bdevname(dev_t, char *buffer); -extern inline const char *bdevname(struct block_device *bdev, char *buffer) -{ - return __bdevname(bdev->bd_dev, buffer); -} +extern const char *bdevname(struct block_device *bdev, char *buffer); extern struct block_device *lookup_bdev(const char *); extern struct block_device *open_bdev_excl(const char *, int, int, void *); extern void close_bdev_excl(struct block_device *, int); |