diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-08-05 03:54:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-08-05 03:54:08 -0700 |
| commit | a276960837a7c87da6c0dede23f923675e5686f0 (patch) | |
| tree | 150acd597823b332eda7bda30ef649c99c2da5d3 /include/linux | |
| parent | 6909f28b899ae976c9f8f6666b21cc1a7eb3e680 (diff) | |
| parent | a731692ee1cf9b59c789b165c2bbdd2b0c69b70b (diff) | |
Merge bk://linux-mtd.bkbits.net/mtd-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/fs.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 7f64f2b2cada..f8677c13b4a8 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1527,6 +1527,8 @@ extern int simple_fill_super(struct super_block *, int, struct tree_descr *); extern int simple_pin_fs(char *name, struct vfsmount **mount, int *count); extern void simple_release_fs(struct vfsmount **mount, int *count); +extern ssize_t simple_read_from_buffer(void __user *, size_t, loff_t *, void *, size_t); + extern int inode_change_ok(struct inode *, struct iattr *); extern int __must_check inode_setattr(struct inode *, struct iattr *); |