diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-12-14 20:29:45 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-12-14 20:29:45 -0800 |
| commit | d1e652c708a4b42fba7fdae96d673d80c383dfa8 (patch) | |
| tree | 244db5a3876624d1f9c7ac44683d308d3c83bd02 /include/linux | |
| parent | bda0e9568615f5af3bd927420f6deb2d1d7773ac (diff) | |
| parent | 8c88cd21b9eccf0b65591056531eba0998212a56 (diff) | |
Merge master.kernel.org:/home/hch/BK/xfs/linux-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/fs.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index bd133801c3e0..18557957520f 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1098,15 +1098,20 @@ extern int bd_claim(struct block_device *, void *); extern void bd_release(struct block_device *); extern void blk_run_queues(void); -/* fs/devices.c */ +/* fs/char_dev.c */ 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 *); + +/* fs/block_dev.c */ extern const char *__bdevname(dev_t); extern inline const char *bdevname(struct block_device *bdev) { return __bdevname(bdev->bd_dev); } +extern struct block_device *open_bdev_excl(const char *, int, int, void *); +extern void close_bdev_excl(struct block_device *, int); + extern const char * cdevname(kdev_t); extern const char * kdevname(kdev_t); extern void init_special_inode(struct inode *, umode_t, dev_t); |