Merge branch 'topic/misc' into fix/misc

[~andy/linux] / include / linux / file.h

diff --git a/include/linux/file.h b/include/linux/file.h
index 6a8d3612eb2afceeb3cf9b7ecb61447cfb4ef813..5555508fd5171f6c7a546c2d7364876223e7c9cc 100644 (file)
--- a/include/linux/file.h
+++ b/include/linux/file.h
@@ -18,8 +18,9 @@ extern void drop_file_write_access(struct file *file);
 struct file_operations;
 struct vfsmount;
 struct dentry;
-extern struct file *alloc_file(struct vfsmount *, struct dentry *dentry,
-               fmode_t mode, const struct file_operations *fop);
+struct path;
+extern struct file *alloc_file(struct path *, fmode_t mode,
+       const struct file_operations *fop);
 
 static inline void fput_light(struct file *file, int fput_needed)
 {