1 --- a/fs/yaffs2/yaffs_vfs_glue.c
2 +++ b/fs/yaffs2/yaffs_vfs_glue.c
3 @@ -272,20 +272,29 @@ static int yaffs_sync_object(struct file
5 static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir);
7 -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
8 -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0))
9 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
10 +static int yaffs_create(struct inode *dir, struct dentry *dentry, umode_t mode,
12 +#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0))
13 static int yaffs_create(struct inode *dir, struct dentry *dentry, umode_t mode,
16 +#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
17 static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode,
20 +static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode);
23 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
24 +static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry,
25 + unsigned int flags);
26 +#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
27 static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry,
30 -static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode);
31 static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry);
34 static int yaffs_link(struct dentry *old_dentry, struct inode *dir,
35 struct dentry *dentry);
36 static int yaffs_unlink(struct inode *dir, struct dentry *dentry);
37 @@ -811,7 +820,10 @@ struct inode *yaffs_get_inode(struct sup
39 * Lookup is used to find objects in the fs
41 -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
42 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
43 +static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry,
45 +#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
47 static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry,
49 @@ -1801,7 +1813,10 @@ static int yaffs_mkdir(struct inode *dir
53 -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0))
54 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
55 +static int yaffs_create(struct inode *dir, struct dentry *dentry, umode_t mode,
57 +#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0))
58 static int yaffs_create(struct inode *dir, struct dentry *dentry, umode_t mode,
60 #elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))