diff options
| author | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 20:24:46 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 20:24:46 -0800 |
| commit | aed492fcb972130f11cd62fd8ca0b2af95f54d03 (patch) | |
| tree | ecd755228f49b188323b4dd257b06fc43fb2f9ae /include/linux | |
| parent | 2ef7e8cef81e6a091de2aebd9d30c273edf6c13c (diff) | |
v2.4.12.5 -> v2.4.12.6
- Stephen Rothwell: APM idle time handling fixes, docbook update, cleanup
- Jeff Garzik: network driver updates
- Greg KH: USB updates
- Al Viro: UFS update, binfmt_misc rewrite.
- Andreas Dilger: /dev/random fixes
- David Miller: network/sparc updates
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/i2o.h | 1 | ||||
| -rw-r--r-- | include/linux/ufs_fs.h | 10 | ||||
| -rw-r--r-- | include/linux/usb.h | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/include/linux/i2o.h b/include/linux/i2o.h index 6fdec1eca6ca..81a50b2e9005 100644 --- a/include/linux/i2o.h +++ b/include/linux/i2o.h @@ -31,6 +31,7 @@ #include <asm/semaphore.h> /* Needed for MUTEX init macros */ #include <linux/config.h> #include <linux/notifier.h> +#include <linux/ioport.h> /* Needed for struct resource */ #include <asm/atomic.h> /* diff --git a/include/linux/ufs_fs.h b/include/linux/ufs_fs.h index 04e4a8a7c7d6..e50451a8602b 100644 --- a/include/linux/ufs_fs.h +++ b/include/linux/ufs_fs.h @@ -532,6 +532,14 @@ extern void ufs_put_cylinder (struct super_block *, unsigned); /* dir.c */ extern struct inode_operations ufs_dir_inode_operations; extern int ufs_check_dir_entry (const char *, struct inode *, struct ufs_dir_entry *, struct buffer_head *, unsigned long); +extern int ufs_add_link (struct dentry *, struct inode *); +extern ino_t ufs_inode_by_name(struct inode *, struct dentry *); +extern int ufs_make_empty(struct inode *, struct inode *); +extern struct ufs_dir_entry * ufs_find_entry (struct dentry *, struct buffer_head **); +extern int ufs_delete_entry (struct inode *, struct ufs_dir_entry *, struct buffer_head *); +extern int ufs_empty_dir (struct inode *); +extern struct ufs_dir_entry * ufs_dotdot (struct inode *, struct buffer_head **); +extern void ufs_set_link(struct inode *, struct ufs_dir_entry *, struct buffer_head *, struct inode *); /* file.c */ extern struct inode_operations ufs_file_inode_operations; @@ -541,7 +549,7 @@ extern struct address_space_operations ufs_aops; /* ialloc.c */ extern void ufs_free_inode (struct inode *inode); -extern struct inode * ufs_new_inode (const struct inode *, int, int *); +extern struct inode * ufs_new_inode (const struct inode *, int); /* inode.c */ extern int ufs_frag_map (struct inode *, int); diff --git a/include/linux/usb.h b/include/linux/usb.h index 063061f5511d..e813425c32a4 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h @@ -855,7 +855,7 @@ void usb_show_string(struct usb_device *dev, char *id, int index); extern struct list_head usb_driver_list; extern struct list_head usb_bus_list; -extern rwlock_t usb_bus_list_lock; +extern struct semaphore usb_bus_list_lock; /* * USB device fs stuff |