Merge branch 'fscache' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into for-linus

2012-12-20 18:49:14 -05:00
parent b911a6bdee 91c7fbbf63
commit 21e89c0c48
302 changed files with 4820 additions and 3453 deletions
@@ -1994,6 +1994,7 @@ struct filename {
 	bool			separate; /* should "name" be freed? */
 };

+extern long vfs_truncate(struct path *, loff_t);
 extern int do_truncate(struct dentry *, loff_t start, unsigned int time_attrs,
 		       struct file *filp);
 extern int do_fallocate(struct file *file, int mode, loff_t offset,