From c8c191a40fa7b69fbd654e2375869e2662c729e7 Mon Sep 17 00:00:00 2001 From: Charles Manning Date: Thu, 17 Jun 2010 15:55:13 +1200 Subject: [PATCH 1/1] yaffs: Change yaffs_sync_object prototype for new 2.6.35 VFS interface The sync interface changed, we change too... Signed-off-by: Charles Manning --- yaffs_fs.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/yaffs_fs.c b/yaffs_fs.c index b4ee69e..662562f 100644 --- a/yaffs_fs.c +++ b/yaffs_fs.c @@ -202,8 +202,12 @@ static int yaffs_file_flush(struct file *file, fl_owner_t id); static int yaffs_file_flush(struct file *file); #endif +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 34)) +static int yaffs_sync_object(struct file *file, int datasync); +#else static int yaffs_sync_object(struct file *file, struct dentry *dentry, int datasync); +#endif static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir); @@ -1742,12 +1746,19 @@ static int yaffs_symlink(struct inode *dir, struct dentry *dentry, return -ENOMEM; } +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 34)) +static int yaffs_sync_object(struct file *file, int datasync) +#else static int yaffs_sync_object(struct file *file, struct dentry *dentry, int datasync) +#endif { yaffs_Object *obj; yaffs_Device *dev; +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 34)) + struct dentry *dentry = file->f_path.dentry; +#endif obj = yaffs_DentryToObject(dentry); -- 2.30.2