| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960 |
- --- a/fs/yaffs2/yaffs_vfs_glue.c
- +++ b/fs/yaffs2/yaffs_vfs_glue.c
- @@ -272,20 +272,29 @@ static int yaffs_sync_object(struct file
-
- static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir);
-
- -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0))
- +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
- +static int yaffs_create(struct inode *dir, struct dentry *dentry, umode_t mode,
- + bool excl);
- +#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0))
- static int yaffs_create(struct inode *dir, struct dentry *dentry, umode_t mode,
- struct nameidata *n);
- -#else
- +#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode,
- struct nameidata *n);
- +#else
- +static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode);
- #endif
- +
- +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
- +static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry,
- + unsigned int flags);
- +#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry,
- struct nameidata *n);
- #else
- -static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode);
- static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry);
- #endif
- +
- static int yaffs_link(struct dentry *old_dentry, struct inode *dir,
- struct dentry *dentry);
- static int yaffs_unlink(struct inode *dir, struct dentry *dentry);
- @@ -811,7 +820,10 @@ struct inode *yaffs_get_inode(struct sup
- /*
- * Lookup is used to find objects in the fs
- */
- -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
- +static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry,
- + unsigned int flags)
- +#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-
- static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry,
- struct nameidata *n)
- @@ -1801,7 +1813,10 @@ static int yaffs_mkdir(struct inode *dir
- return retVal;
- }
-
- -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0))
- +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
- +static int yaffs_create(struct inode *dir, struct dentry *dentry, umode_t mode,
- + bool excl)
- +#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0))
- static int yaffs_create(struct inode *dir, struct dentry *dentry, umode_t mode,
- struct nameidata *n)
- #elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
|