2012-02-10 17:21:43 +02:00
|
|
|
--- a/fs/yaffs2/yaffs_vfs_glue.c
|
|
|
|
|
+++ b/fs/yaffs2/yaffs_vfs_glue.c
|
2012-10-31 17:12:45 +02:00
|
|
|
@@ -273,8 +273,13 @@ static int yaffs_sync_object(struct file
|
2012-02-10 17:21:43 +02:00
|
|
|
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))
|
|
|
|
|
+static int yaffs_create(struct inode *dir, struct dentry *dentry, umode_t mode,
|
|
|
|
|
+ struct nameidata *n);
|
|
|
|
|
+#else
|
|
|
|
|
static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode,
|
|
|
|
|
struct nameidata *n);
|
|
|
|
|
+#endif
|
|
|
|
|
static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry,
|
|
|
|
|
struct nameidata *n);
|
|
|
|
|
#else
|
2012-10-31 17:12:45 +02:00
|
|
|
@@ -286,9 +291,17 @@ static int yaffs_link(struct dentry *old
|
2012-02-10 17:21:43 +02:00
|
|
|
static int yaffs_unlink(struct inode *dir, struct dentry *dentry);
|
|
|
|
|
static int yaffs_symlink(struct inode *dir, struct dentry *dentry,
|
|
|
|
|
const char *symname);
|
|
|
|
|
+
|
|
|
|
|
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0))
|
|
|
|
|
+static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode);
|
|
|
|
|
+#else
|
|
|
|
|
static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, int mode);
|
|
|
|
|
+#endif
|
|
|
|
|
|
|
|
|
|
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
|
|
|
|
|
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0))
|
|
|
|
|
+static int yaffs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode,
|
|
|
|
|
+ dev_t dev);
|
|
|
|
|
+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
|
|
|
|
|
static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
|
|
|
|
|
dev_t dev);
|
|
|
|
|
#else
|
2012-10-31 17:12:45 +02:00
|
|
|
@@ -1679,7 +1692,10 @@ out:
|
2012-02-10 17:21:43 +02:00
|
|
|
#define YCRED(x) (x->cred)
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
|
|
|
|
|
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0))
|
|
|
|
|
+static int yaffs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode,
|
|
|
|
|
+ dev_t rdev)
|
|
|
|
|
+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
|
|
|
|
|
static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
|
|
|
|
|
dev_t rdev)
|
|
|
|
|
#else
|
2012-10-31 17:12:45 +02:00
|
|
|
@@ -1769,7 +1785,11 @@ static int yaffs_mknod(struct inode *dir
|
2012-02-10 17:21:43 +02:00
|
|
|
return error;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0))
|
|
|
|
|
+static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
|
|
|
|
|
+#else
|
|
|
|
|
static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
|
|
|
|
|
+#endif
|
|
|
|
|
{
|
|
|
|
|
int retVal;
|
|
|
|
|
T(YAFFS_TRACE_OS, (TSTR("yaffs_mkdir\n")));
|
2012-10-31 17:12:45 +02:00
|
|
|
@@ -1777,7 +1797,10 @@ static int yaffs_mkdir(struct inode *dir
|
2012-02-10 17:21:43 +02:00
|
|
|
return retVal;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
|
|
|
|
|
+#if (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))
|
|
|
|
|
static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode,
|
|
|
|
|
struct nameidata *n)
|
|
|
|
|
#else
|
