projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://www.aleph1.co.uk/home/aleph1/git/yaffs2
[yaffs2.git]
/
yaffs_fs.c
diff --git
a/yaffs_fs.c
b/yaffs_fs.c
index 91d3a8170c7edaf9dac7833aaa57bfa9ff7a984a..9469e1b531d5716a02dd82376b4e5c97658f8381 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);
@@
-1965,7
+1976,6
@@
ssize_t yaffs_listxattr(struct dentry *dentry, char *buff, size_t size)
if (error == 0) {
if (error == 0) {
- int result;
dev = obj->myDev;
yaffs_GrossLock(dev);
error = yaffs_ListXAttributes(obj, buff, size);
dev = obj->myDev;
yaffs_GrossLock(dev);
error = yaffs_ListXAttributes(obj, buff, size);
@@
-2217,7
+2227,7
@@
static int yaffs_BackgroundThread(void *data)
if(time_before(expires,now))
expires = now + HZ;
if(time_before(expires,now))
expires = now + HZ;
- init_timer(&timer);
+ init_timer
_on_stack
(&timer);
timer.expires = expires+1;
timer.data = (unsigned long) current;
timer.function = yaffs_background_waker;
timer.expires = expires+1;
timer.data = (unsigned long) current;
timer.function = yaffs_background_waker;