drm/nouveau: off by one in init_i2c_device_find()

[safe/jmp/linux-2.6] / fs / sysv / file.c

diff --git a/fs/sysv/file.c b/fs/sysv/file.c
index da69abc..750cc22 100644 (file)
--- a/fs/sysv/file.c
+++ b/fs/sysv/file.c
@@ -19,31 +19,18 @@
  * We have mostly NULLs here: the current defaults are OK for
  * the coh filesystem.
  */
-struct file_operations sysv_file_operations = {
+const struct file_operations sysv_file_operations = {
        .llseek         = generic_file_llseek,
-       .read           = generic_file_read,
-       .write          = generic_file_write,
+       .read           = do_sync_read,
+       .aio_read       = generic_file_aio_read,
+       .write          = do_sync_write,
+       .aio_write      = generic_file_aio_write,
        .mmap           = generic_file_mmap,
-       .fsync          = sysv_sync_file,
-       .sendfile       = generic_file_sendfile,
+       .fsync          = generic_file_fsync,
+       .splice_read    = generic_file_splice_read,
 };
 
-struct inode_operations sysv_file_inode_operations = {
+const struct inode_operations sysv_file_inode_operations = {
        .truncate       = sysv_truncate,
        .getattr        = sysv_getattr,
 };
-
-int sysv_sync_file(struct file * file, struct dentry *dentry, int datasync)
-{
-       struct inode *inode = dentry->d_inode;
-       int err;
-
-       err = sync_mapping_buffers(inode->i_mapping);
-       if (!(inode->i_state & I_DIRTY))
-               return err;
-       if (datasync && !(inode->i_state & I_DIRTY_DATASYNC))
-               return err;
-       
-       err |= sysv_sync_inode(inode);
-       return err ? -EIO : 0;
-}