55 lines
1.8 KiB
Plaintext
55 lines
1.8 KiB
Plaintext
|
From: Jeff Mahoney <jeffm@suse.com>
|
||
|
|
Subject: [PATCH] novfs: API changes for 2.6.35
|
||
|
|
Patch-mainline: WHenever novfs makes it upstream
|
||
|
|
|
||
|
|
This patch contains API changes for 2.6.35
|
||
|
|
|
||
|
|
Acked-by: Jeff Mahoney <jeffm@suse.com>
|
||
|
|
---
|
||
|
|
fs/novfs/inode.c | 10 +++++-----
|
||
|
|
1 file changed, 5 insertions(+), 5 deletions(-)
|
||
|
|
|
||
|
|
--- a/fs/novfs/inode.c
|
||
|
|
+++ b/fs/novfs/inode.c
|
||
|
|
@@ -84,7 +84,7 @@ void addtodentry(struct dentry *Parent,
|
||
|
|
int novfs_filldir(void *data, const char *name, int namelen, loff_t off,
|
||
|
|
ino_t ino, unsigned ftype);
|
||
|
|
int novfs_dir_readdir(struct file *filp, void *dirent, filldir_t filldir);
|
||
|
|
-int novfs_dir_fsync(struct file *file, struct dentry *dentry, int datasync);
|
||
|
|
+int novfs_dir_fsync(struct file *file, int datasync);
|
||
|
|
|
||
|
|
/*
|
||
|
|
* Declared address space operations
|
||
|
|
@@ -115,7 +115,7 @@ int novfs_f_mmap(struct file *file, stru
|
||
|
|
int novfs_f_open(struct inode *, struct file *);
|
||
|
|
int novfs_f_flush(struct file *, fl_owner_t);
|
||
|
|
int novfs_f_release(struct inode *, struct file *);
|
||
|
|
-int novfs_f_fsync(struct file *, struct dentry *, int datasync);
|
||
|
|
+int novfs_f_fsync(struct file *, int datasync);
|
||
|
|
int novfs_f_lock(struct file *, int, struct file_lock *);
|
||
|
|
|
||
|
|
/*
|
||
|
|
@@ -1278,11 +1278,11 @@ int novfs_dir_readdir(struct file *file,
|
||
|
|
return 1;
|
||
|
|
}
|
||
|
|
|
||
|
|
-int novfs_dir_fsync(struct file *file, struct dentry *dentry, int datasync)
|
||
|
|
+int novfs_dir_fsync(struct file *file, int datasync)
|
||
|
|
{
|
||
|
|
DbgPrint("Name %.*s", file->f_dentry->d_name.len,
|
||
|
|
file->f_dentry->d_name.name);
|
||
|
|
- return (simple_sync_file(file, dentry, datasync));
|
||
|
|
+ return generic_file_fsync(file, datasync);
|
||
|
|
}
|
||
|
|
|
||
|
|
ssize_t novfs_f_read(struct file * file, char *buf, size_t len, loff_t * off)
|
||
|
|
@@ -1709,7 +1709,7 @@ int novfs_f_release(struct inode *inode,
|
||
|
|
return (retCode);
|
||
|
|
}
|
||
|
|
|
||
|
|
-int novfs_f_fsync(struct file *file, struct dentry *dentry, int datasync)
|
||
|
|
+int novfs_f_fsync(struct file *file, int datasync)
|
||
|
|
{
|
||
|
|
return 0;
|
||
|
|
}
|