projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
yaffs: Change yaffs_sync_object prototype for new 2.6.35 VFS interface
[yaffs2.git]
/
yaffs_fs.c
diff --git
a/yaffs_fs.c
b/yaffs_fs.c
index b4ee69edf1f9642cc9ffc8bbc12bc931d3bb4b24..662562fda537cdfe58a0fd72a99097446d154272 100644
(file)
--- 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
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);
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);
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;
}
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)
static int yaffs_sync_object(struct file *file, struct dentry *dentry,
int datasync)
+#endif
{
yaffs_Object *obj;
yaffs_Device *dev;
{
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);
obj = yaffs_DentryToObject(dentry);