diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-07-30 13:38:04 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2009-07-30 13:38:04 -0400 |
| commit | 2e6713c7662cc5ebc7346b033c404cb2f708fd51 (patch) | |
| tree | 8492ea548fea2d8243e4af4b877906afc4e32783 /include/linux/fs.h | |
| parent | b4093d6235b7e4249616651ee328600ced48a18a (diff) | |
| parent | 658874f05d040ca96eb5ba9b1c30ce0ff287d762 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'include/linux/fs.h')
| -rw-r--r-- | include/linux/fs.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 0872372184fe..a36ffa5a77a4 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
| @@ -1946,6 +1946,7 @@ extern void putname(const char *name); | |||
| 1946 | extern int register_blkdev(unsigned int, const char *); | 1946 | extern int register_blkdev(unsigned int, const char *); |
| 1947 | extern void unregister_blkdev(unsigned int, const char *); | 1947 | extern void unregister_blkdev(unsigned int, const char *); |
| 1948 | extern struct block_device *bdget(dev_t); | 1948 | extern struct block_device *bdget(dev_t); |
| 1949 | extern struct block_device *bdgrab(struct block_device *bdev); | ||
| 1949 | extern void bd_set_size(struct block_device *, loff_t size); | 1950 | extern void bd_set_size(struct block_device *, loff_t size); |
| 1950 | extern void bd_forget(struct inode *inode); | 1951 | extern void bd_forget(struct inode *inode); |
| 1951 | extern void bdput(struct block_device *); | 1952 | extern void bdput(struct block_device *); |