summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-08-07 18:53:44 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-08-07 18:53:44 -0700
commitfb385003c4ac9634cf2448f6ded81e5fd1190c1f (patch)
tree3a6068559cef144c04b96372ee0eecf20dfb108b /include
parent36b8659f9316b24c514a7c8290596b2382b91dd2 (diff)
parentb36ec0428a06fcbdb67d61e9e664154e5dd9a8c7 (diff)
downloadlinux-3.10-fb385003c4ac9634cf2448f6ded81e5fd1190c1f.tar.gz
linux-3.10-fb385003c4ac9634cf2448f6ded81e5fd1190c1f.tar.bz2
linux-3.10-fb385003c4ac9634cf2448f6ded81e5fd1190c1f.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/hch/xfs-icache-races
* git://git.kernel.org/pub/scm/linux/kernel/git/hch/xfs-icache-races: xfs: fix freeing of inodes not yet added to the inode cache vfs: add __destroy_inode vfs: fix inode_init_always calling convention
Diffstat (limited to 'include')
-rw-r--r--include/linux/fs.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h
index a36ffa5a77a..67888a9e065 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2137,7 +2137,7 @@ extern loff_t default_llseek(struct file *file, loff_t offset, int origin);
extern loff_t vfs_llseek(struct file *file, loff_t offset, int origin);
-extern struct inode * inode_init_always(struct super_block *, struct inode *);
+extern int inode_init_always(struct super_block *, struct inode *);
extern void inode_init_once(struct inode *);
extern void inode_add_to_lists(struct super_block *, struct inode *);
extern void iput(struct inode *);
@@ -2164,6 +2164,7 @@ extern void __iget(struct inode * inode);
extern void iget_failed(struct inode *);
extern void clear_inode(struct inode *);
extern void destroy_inode(struct inode *);
+extern void __destroy_inode(struct inode *);
extern struct inode *new_inode(struct super_block *);
extern int should_remove_suid(struct dentry *);
extern int file_remove_suid(struct file *);