diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-04-17 20:47:28 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-04-17 20:47:28 -0700 |
| commit | a9eb9eb7415c26c71a25a73bd0c734f397c8c021 (patch) | |
| tree | 240dee514a65974e4bbeff84394b9f6258c9d606 /include/linux/fs.h | |
| parent | e9fae7f4e0d3e4eaedb8922ed48c93a08fd7ebae (diff) | |
| parent | e4cf8264fa0bbc0b113442df03ceb9606d2ec428 (diff) | |
Merge master.kernel.org:/home/davem/BK/net-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include/linux/fs.h')
| -rw-r--r-- | include/linux/fs.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index c9fb9bbe154a..edaaaf6ce341 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -751,7 +751,6 @@ struct super_block { char s_id[32]; /* Informational name */ - struct kobject kobj; /* anchor for sysfs */ void *s_fs_info; /* Filesystem private info */ /* @@ -1359,7 +1358,7 @@ extern struct file * get_empty_filp(void); extern void file_move(struct file *f, struct list_head *list); extern void file_kill(struct file *f); struct bio; -extern int submit_bio(int, struct bio *); +extern void submit_bio(int, struct bio *); extern int bdev_read_only(struct block_device *); extern int set_blocksize(struct block_device *, int); extern int sb_set_blocksize(struct super_block *, int); |