diff options
| author | Niv Sardi <xaiki@debian.org> | 2008-11-06 23:07:12 -0500 |
|---|---|---|
| committer | Niv Sardi <xaiki@debian.org> | 2008-11-06 23:07:12 -0500 |
| commit | dcd7b4e5c0649b1d2219399529b20de1df517e55 (patch) | |
| tree | ef00739e48ddda0a30061d62a7348ed4b0c9aeeb /include/linux | |
| parent | 75fa67706cce5272bcfc51ed646f2da21f3bdb6e (diff) | |
| parent | 91b777125175077fb74025608dba87f100586c62 (diff) | |
Merge branch 'master' of git://oss.sgi.com:8090/xfs/linux-2.6
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 0dcdd9458f4b..51bd9370d437 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
| @@ -1874,7 +1874,9 @@ extern loff_t default_llseek(struct file *file, loff_t offset, int origin); | |||
| 1874 | 1874 | ||
| 1875 | extern loff_t vfs_llseek(struct file *file, loff_t offset, int origin); | 1875 | extern loff_t vfs_llseek(struct file *file, loff_t offset, int origin); |
| 1876 | 1876 | ||
| 1877 | extern struct inode * inode_init_always(struct super_block *, struct inode *); | ||
| 1877 | extern void inode_init_once(struct inode *); | 1878 | extern void inode_init_once(struct inode *); |
| 1879 | extern void inode_add_to_lists(struct super_block *, struct inode *); | ||
| 1878 | extern void iput(struct inode *); | 1880 | extern void iput(struct inode *); |
| 1879 | extern struct inode * igrab(struct inode *); | 1881 | extern struct inode * igrab(struct inode *); |
| 1880 | extern ino_t iunique(struct super_block *, ino_t); | 1882 | extern ino_t iunique(struct super_block *, ino_t); |